diff --git a/Aviso/Anhänge/frmAddSendnung.Designer.vb b/Aviso/Anhänge/frmAddSendnung.Designer.vb index 9f3846a..af4d5a0 100644 --- a/Aviso/Anhänge/frmAddSendnung.Designer.vb +++ b/Aviso/Anhänge/frmAddSendnung.Designer.vb @@ -193,7 +193,7 @@ Partial Class frmAddSendnung ' 'btn ' - Me.btn.DialogResult = System.Windows.Forms.DialogResult.OK + Me.btn.DialogResult = DialogResult.OK Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btn.Location = New System.Drawing.Point(12, 244) Me.btn.Name = "btn" diff --git a/Aviso/Anhänge/frmSendungAnhangImport.vb b/Aviso/Anhänge/frmSendungAnhangImport.vb index 8d3ccb5..89ca505 100644 --- a/Aviso/Anhänge/frmSendungAnhangImport.vb +++ b/Aviso/Anhänge/frmSendungAnhangImport.vb @@ -1404,7 +1404,7 @@ Public Class frmSendungAnhangImport Private Sub Button17_Click(sender As Object, e As EventArgs) Handles Button17.Click Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm() Dim sv As New frmAddSendungsvermerkShort(AvisoId, SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID) ', dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value) - sv.Location = Me.PointToClient(System.Windows.Forms.Cursor.Position) + sv.Location = Me.PointToClient(Cursor.Position) sv.ShowDialog(frmGrayOut) frmGrayOut.Close() sv.Close() diff --git a/Aviso/Anhänge/frmSendungAnhangUmbenennenUmkateg.Designer.vb b/Aviso/Anhänge/frmSendungAnhangUmbenennenUmkateg.Designer.vb index a2c8ceb..700fa3e 100644 --- a/Aviso/Anhänge/frmSendungAnhangUmbenennenUmkateg.Designer.vb +++ b/Aviso/Anhänge/frmSendungAnhangUmbenennenUmkateg.Designer.vb @@ -86,7 +86,7 @@ Partial Class frmSendungAnhangUmbenennenUmkateg 'btnAnfuegen ' Me.btnAnfuegen.BackColor = System.Drawing.Color.White - Me.btnAnfuegen.DialogResult = System.Windows.Forms.DialogResult.OK + Me.btnAnfuegen.DialogResult = DialogResult.OK Me.btnAnfuegen.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnAnfuegen.Location = New System.Drawing.Point(77, 73) Me.btnAnfuegen.Name = "btnAnfuegen" diff --git a/Aviso/Auswertung/frmAuswertung.vb b/Aviso/Auswertung/frmAuswertung.vb index 63ce312..9b2d5b2 100644 --- a/Aviso/Auswertung/frmAuswertung.vb +++ b/Aviso/Auswertung/frmAuswertung.vb @@ -559,7 +559,7 @@ Public Class frmAuswertung Exit Sub End If - If result = System.Windows.Forms.DialogResult.OK Then + If result = DialogResult.OK Then Me.Cursor = Cursors.WaitCursor diff --git a/Aviso/Auswertung/usrctlMAUebersicht.vb b/Aviso/Auswertung/usrctlMAUebersicht.vb index a081fde..b38474e 100644 --- a/Aviso/Auswertung/usrctlMAUebersicht.vb +++ b/Aviso/Auswertung/usrctlMAUebersicht.vb @@ -25,7 +25,7 @@ Public Class usrctlMAUebersicht Panel1.Controls.Add(t) Panel1.Width = 800 Panel1.Height = 500 - Panel1.BorderStyle = Windows.Forms.BorderStyle.FixedSingle + Panel1.BorderStyle = BorderStyle.FixedSingle t.Width = 800 @@ -33,7 +33,7 @@ Public Class usrctlMAUebersicht t.AutoScroll = True t.AutoSize = True - t.AutoSizeMode = Windows.Forms.AutoSizeMode.GrowAndShrink + t.AutoSizeMode = AutoSizeMode.GrowAndShrink t.Dock = DockStyle.Fill diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index e6abee3..89d9fce 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -213,6 +213,7 @@ + @@ -220,6 +221,7 @@ ..\..\..\dll\ThoughtWorks.QRCode.dll + diff --git a/Aviso/Benutzerdefinierte Elemente/SendTAB.vb b/Aviso/Benutzerdefinierte Elemente/SendTAB.vb index 26badf8..ce81029 100644 --- a/Aviso/Benutzerdefinierte Elemente/SendTAB.vb +++ b/Aviso/Benutzerdefinierte Elemente/SendTAB.vb @@ -13,7 +13,7 @@ End Sub Private Sub Label2_Click(sender As Object, e As MouseEventArgs) Handles lblAuftr.MouseClick, lblAbfBez.MouseClick, pnl.MouseClick, Me.MouseClick, lblNr.MouseClick, pnl.Click, MyBase.Click, lblNr.Click, lblAuftr.Click, lblAbfBez.Click - If e.Button = Windows.Forms.MouseButtons.Right Then + If e.Button = MouseButtons.Right Then Me.ContextMenuStrip = cntxt cntxt.Show(MousePosition) End If diff --git a/Aviso/Dokumentenbeschriftung/frmPrintLayout.vb b/Aviso/Dokumentenbeschriftung/frmPrintLayout.vb index b3454b6..55e3c84 100644 --- a/Aviso/Dokumentenbeschriftung/frmPrintLayout.vb +++ b/Aviso/Dokumentenbeschriftung/frmPrintLayout.vb @@ -70,7 +70,7 @@ Public Class frmPrintLayout 'Dim p As GrapeCity.Viewer.Common.PrintingSettings = Me.Viewer.PrintingSettings - 'If Me.ReportViewer1.PrintDialog() = Windows.Forms.DialogResult.OK Then Me.Close() + 'If Me.ReportViewer1.PrintDialog() = DialogResult.OK Then Me.Close() End Sub Public Sub PRINTMe() diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 13996dc..7e8323e 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/My Project/Resources.Designer.vb b/Aviso/My Project/Resources.Designer.vb index 8083dc1..6034fd1 100644 --- a/Aviso/My Project/Resources.Designer.vb +++ b/Aviso/My Project/Resources.Designer.vb @@ -100,6 +100,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die ähnelt. + ''' + Friend ReadOnly Property adasda3asdsa3adsa() As String + Get + Return ResourceManager.GetString("adasda3asdsa3adsa", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -199,15 +208,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Sucht eine lokalisierte Zeichenfolge, die ähnelt. - ''' - Friend ReadOnly Property asdasdsad2asda1sd1asd2asd1as21d() As String - Get - Return ResourceManager.GetString("asdasdsad2asda1sd1asd2asd1as21d", resourceCulture) - End Get - End Property - ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -1368,7 +1368,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 3.4.9.4 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die 3.4.9.7 ähnelt. ''' Friend ReadOnly Property Version() As String Get diff --git a/Aviso/My Project/Resources.resx b/Aviso/My Project/Resources.resx index 576eaf0..0cbde51 100644 --- a/Aviso/My Project/Resources.resx +++ b/Aviso/My Project/Resources.resx @@ -344,7 +344,7 @@ ..\Resources\akt_ATILLA.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - 3.4.9.4 + 3.4.9.7 ..\Resources\Verag-AG-Logopng.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -565,7 +565,7 @@ ..\Resources\mitarbeiter_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + \ No newline at end of file diff --git a/Aviso/frmAddAktenvermerkShort.vb b/Aviso/frmAddAktenvermerkShort.vb index de5e4db..bcc2e43 100644 --- a/Aviso/frmAddAktenvermerkShort.vb +++ b/Aviso/frmAddAktenvermerkShort.vb @@ -224,10 +224,10 @@ btnZollDEEingereicht.Click, btnSBG.Click, btnNKD.Click, btnWAI.Click, btnSFD.Cli End Sub Private Sub frmAddAktenvermerkShort_Shown(sender As Object, e As EventArgs) Handles Me.Shown - Dim p = System.Windows.Forms.Cursor.Position + Dim p = Cursor.Position If (p.X + Me.Width) > My.Computer.Screen.WorkingArea.Width Then p.X = My.Computer.Screen.WorkingArea.Width - Me.Width If (p.Y + Me.Height) > My.Computer.Screen.WorkingArea.Height Then p.Y = My.Computer.Screen.WorkingArea.Height - Me.Height - Me.Location = p '.Me.PointToClient(System.Windows.Forms.Cursor.Position) + Me.Location = p '.Me.PointToClient(System.Cursor.Position) End Sub Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click diff --git a/Aviso/frmAddSendungsvermerkShort.Designer.vb b/Aviso/frmAddSendungsvermerkShort.Designer.vb index 43290cb..8987c5f 100644 --- a/Aviso/frmAddSendungsvermerkShort.Designer.vb +++ b/Aviso/frmAddSendungsvermerkShort.Designer.vb @@ -28,7 +28,12 @@ Partial Class frmAddSendungsvermerkShort Me.pnlMain = New System.Windows.Forms.Panel() Me.pnlSendungsVermker = New System.Windows.Forms.Panel() Me.Label4 = New System.Windows.Forms.Label() - Me.Button2 = New System.Windows.Forms.Button() + Me.optFremd_ATB = New System.Windows.Forms.CheckBox() + Me.optFremd_SendungAvisiert = New System.Windows.Forms.CheckBox() + Me.optFahrerKeinATR = New System.Windows.Forms.CheckBox() + Me.optFrachtkostenAngefordert = New System.Windows.Forms.CheckBox() + Me.optKundeNichtErreichbar = New System.Windows.Forms.CheckBox() + Me.optAbsenderbestätigung = New System.Windows.Forms.CheckBox() Me.cbxRgBest = New System.Windows.Forms.CheckBox() Me.optUeberwachungsdok = New System.Windows.Forms.CheckBox() Me.lblErrSpedition = New System.Windows.Forms.Label() @@ -85,7 +90,7 @@ Partial Class frmAddSendungsvermerkShort Me.pnlMain.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlMain.Location = New System.Drawing.Point(0, 0) Me.pnlMain.Name = "pnlMain" - Me.pnlMain.Size = New System.Drawing.Size(434, 389) + Me.pnlMain.Size = New System.Drawing.Size(453, 481) Me.pnlMain.TabIndex = 0 ' 'pnlSendungsVermker @@ -93,7 +98,12 @@ Partial Class frmAddSendungsvermerkShort Me.pnlSendungsVermker.BackColor = System.Drawing.Color.White Me.pnlSendungsVermker.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.pnlSendungsVermker.Controls.Add(Me.Label4) - Me.pnlSendungsVermker.Controls.Add(Me.Button2) + Me.pnlSendungsVermker.Controls.Add(Me.optFremd_ATB) + Me.pnlSendungsVermker.Controls.Add(Me.optFremd_SendungAvisiert) + Me.pnlSendungsVermker.Controls.Add(Me.optFahrerKeinATR) + Me.pnlSendungsVermker.Controls.Add(Me.optFrachtkostenAngefordert) + Me.pnlSendungsVermker.Controls.Add(Me.optKundeNichtErreichbar) + Me.pnlSendungsVermker.Controls.Add(Me.optAbsenderbestätigung) Me.pnlSendungsVermker.Controls.Add(Me.cbxRgBest) Me.pnlSendungsVermker.Controls.Add(Me.optUeberwachungsdok) Me.pnlSendungsVermker.Controls.Add(Me.lblErrSpedition) @@ -134,37 +144,88 @@ Partial Class frmAddSendungsvermerkShort Me.pnlSendungsVermker.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlSendungsVermker.Location = New System.Drawing.Point(0, 0) Me.pnlSendungsVermker.Name = "pnlSendungsVermker" - Me.pnlSendungsVermker.Size = New System.Drawing.Size(434, 389) + Me.pnlSendungsVermker.Size = New System.Drawing.Size(453, 481) Me.pnlSendungsVermker.TabIndex = 0 ' 'Label4 ' Me.Label4.AutoSize = True - Me.Label4.BackColor = System.Drawing.Color.White + Me.Label4.BackColor = System.Drawing.Color.WhiteSmoke Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label4.Location = New System.Drawing.Point(18, 361) + Me.Label4.Location = New System.Drawing.Point(11, 314) Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(79, 17) - Me.Label4.TabIndex = 88 - Me.Label4.Text = "Optionen:" - Me.Label4.Visible = False + Me.Label4.Size = New System.Drawing.Size(125, 17) + Me.Label4.TabIndex = 96 + Me.Label4.Text = "Fremdeinsteller:" ' - 'Button2 + 'optFremd_ATB ' - Me.Button2.Enabled = False - Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button2.Location = New System.Drawing.Point(21, 381) - Me.Button2.Name = "Button2" - Me.Button2.Size = New System.Drawing.Size(281, 33) - Me.Button2.TabIndex = 87 - Me.Button2.Text = "In Neukunden-Abteilung geben >>" - Me.Button2.UseVisualStyleBackColor = True - Me.Button2.Visible = False + Me.optFremd_ATB.AutoSize = True + Me.optFremd_ATB.BackColor = System.Drawing.Color.WhiteSmoke + Me.optFremd_ATB.Location = New System.Drawing.Point(12, 361) + Me.optFremd_ATB.Name = "optFremd_ATB" + Me.optFremd_ATB.Size = New System.Drawing.Size(130, 17) + Me.optFremd_ATB.TabIndex = 94 + Me.optFremd_ATB.Text = "ATB-Nummer erhalten" + Me.optFremd_ATB.UseVisualStyleBackColor = False + ' + 'optFremd_SendungAvisiert + ' + Me.optFremd_SendungAvisiert.AutoSize = True + Me.optFremd_SendungAvisiert.BackColor = System.Drawing.Color.WhiteSmoke + Me.optFremd_SendungAvisiert.Location = New System.Drawing.Point(12, 338) + Me.optFremd_SendungAvisiert.Name = "optFremd_SendungAvisiert" + Me.optFremd_SendungAvisiert.Size = New System.Drawing.Size(193, 17) + Me.optFremd_SendungAvisiert.TabIndex = 93 + Me.optFremd_SendungAvisiert.Text = "Sendung an Fremdeinsteller avisiert" + Me.optFremd_SendungAvisiert.UseVisualStyleBackColor = False + ' + 'optFahrerKeinATR + ' + Me.optFahrerKeinATR.AutoSize = True + Me.optFahrerKeinATR.BackColor = System.Drawing.Color.WhiteSmoke + Me.optFahrerKeinATR.Location = New System.Drawing.Point(308, 52) + Me.optFahrerKeinATR.Name = "optFahrerKeinATR" + Me.optFahrerKeinATR.Size = New System.Drawing.Size(125, 17) + Me.optFahrerKeinATR.TabIndex = 92 + Me.optFahrerKeinATR.Text = "Fahrer hat kein A.TR" + Me.optFahrerKeinATR.UseVisualStyleBackColor = False + ' + 'optFrachtkostenAngefordert + ' + Me.optFrachtkostenAngefordert.AutoSize = True + Me.optFrachtkostenAngefordert.Location = New System.Drawing.Point(12, 163) + Me.optFrachtkostenAngefordert.Name = "optFrachtkostenAngefordert" + Me.optFrachtkostenAngefordert.Size = New System.Drawing.Size(145, 17) + Me.optFrachtkostenAngefordert.TabIndex = 91 + Me.optFrachtkostenAngefordert.Text = "Frachtkosten angefordert" + Me.optFrachtkostenAngefordert.UseVisualStyleBackColor = True + ' + 'optKundeNichtErreichbar + ' + Me.optKundeNichtErreichbar.AutoSize = True + Me.optKundeNichtErreichbar.Location = New System.Drawing.Point(270, 141) + Me.optKundeNichtErreichbar.Name = "optKundeNichtErreichbar" + Me.optKundeNichtErreichbar.Size = New System.Drawing.Size(133, 17) + Me.optKundeNichtErreichbar.TabIndex = 90 + Me.optKundeNichtErreichbar.Text = "Kunde nicht erreichbar" + Me.optKundeNichtErreichbar.UseVisualStyleBackColor = True + ' + 'optAbsenderbestätigung + ' + Me.optAbsenderbestätigung.AutoSize = True + Me.optAbsenderbestätigung.BackColor = System.Drawing.Color.WhiteSmoke + Me.optAbsenderbestätigung.Location = New System.Drawing.Point(308, 32) + Me.optAbsenderbestätigung.Name = "optAbsenderbestätigung" + Me.optAbsenderbestätigung.Size = New System.Drawing.Size(136, 17) + Me.optAbsenderbestätigung.TabIndex = 89 + Me.optAbsenderbestätigung.Text = "Absenderbestät. angef." + Me.optAbsenderbestätigung.UseVisualStyleBackColor = False ' 'cbxRgBest ' Me.cbxRgBest.AutoSize = True - Me.cbxRgBest.Location = New System.Drawing.Point(270, 161) + Me.cbxRgBest.Location = New System.Drawing.Point(270, 187) Me.cbxRgBest.Name = "cbxRgBest" Me.cbxRgBest.Size = New System.Drawing.Size(146, 17) Me.cbxRgBest.TabIndex = 86 @@ -174,7 +235,7 @@ Partial Class frmAddSendungsvermerkShort 'optUeberwachungsdok ' Me.optUeberwachungsdok.AutoSize = True - Me.optUeberwachungsdok.Location = New System.Drawing.Point(270, 138) + Me.optUeberwachungsdok.Location = New System.Drawing.Point(270, 164) Me.optUeberwachungsdok.Name = "optUeberwachungsdok" Me.optUeberwachungsdok.Size = New System.Drawing.Size(114, 17) Me.optUeberwachungsdok.TabIndex = 85 @@ -186,7 +247,7 @@ Partial Class frmAddSendungsvermerkShort Me.lblErrSpedition.AutoSize = True Me.lblErrSpedition.BackColor = System.Drawing.Color.WhiteSmoke Me.lblErrSpedition.ForeColor = System.Drawing.Color.Red - Me.lblErrSpedition.Location = New System.Drawing.Point(175, 226) + Me.lblErrSpedition.Location = New System.Drawing.Point(175, 238) Me.lblErrSpedition.Name = "lblErrSpedition" Me.lblErrSpedition.Size = New System.Drawing.Size(158, 13) Me.lblErrSpedition.TabIndex = 17 @@ -198,7 +259,7 @@ Partial Class frmAddSendungsvermerkShort Me.Label2.AutoSize = True Me.Label2.BackColor = System.Drawing.Color.WhiteSmoke Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) - Me.Label2.Location = New System.Drawing.Point(175, 226) + Me.Label2.Location = New System.Drawing.Point(175, 238) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(57, 13) Me.Label2.TabIndex = 84 @@ -209,7 +270,7 @@ Partial Class frmAddSendungsvermerkShort Me.lblErrGrund.AutoSize = True Me.lblErrGrund.BackColor = System.Drawing.Color.WhiteSmoke Me.lblErrGrund.ForeColor = System.Drawing.Color.Red - Me.lblErrGrund.Location = New System.Drawing.Point(120, 285) + Me.lblErrGrund.Location = New System.Drawing.Point(120, 297) Me.lblErrGrund.Name = "lblErrGrund" Me.lblErrGrund.Size = New System.Drawing.Size(149, 13) Me.lblErrGrund.TabIndex = 26 @@ -225,7 +286,7 @@ Partial Class frmAddSendungsvermerkShort Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Button1.ForeColor = System.Drawing.Color.White - Me.Button1.Location = New System.Drawing.Point(379, -1) + Me.Button1.Location = New System.Drawing.Point(398, -1) Me.Button1.Name = "Button1" Me.Button1.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.Button1.Size = New System.Drawing.Size(54, 20) @@ -238,7 +299,7 @@ Partial Class frmAddSendungsvermerkShort Me.lblErrDokument.AutoSize = True Me.lblErrDokument.BackColor = System.Drawing.Color.WhiteSmoke Me.lblErrDokument.ForeColor = System.Drawing.Color.Red - Me.lblErrDokument.Location = New System.Drawing.Point(312, 91) + Me.lblErrDokument.Location = New System.Drawing.Point(305, 91) Me.lblErrDokument.Name = "lblErrDokument" Me.lblErrDokument.Size = New System.Drawing.Size(100, 26) Me.lblErrDokument.TabIndex = 11 @@ -260,7 +321,7 @@ Partial Class frmAddSendungsvermerkShort ' Me.txtSpedition.BackColor = System.Drawing.Color.WhiteSmoke Me.txtSpedition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtSpedition.Location = New System.Drawing.Point(177, 242) + Me.txtSpedition.Location = New System.Drawing.Point(177, 254) Me.txtSpedition.MaxLength = 50 Me.txtSpedition.Name = "txtSpedition" Me.txtSpedition.Size = New System.Drawing.Size(125, 20) @@ -269,18 +330,19 @@ Partial Class frmAddSendungsvermerkShort 'optSendungInVorbereitung ' Me.optSendungInVorbereitung.AutoSize = True - Me.optSendungInVorbereitung.Location = New System.Drawing.Point(270, 184) + Me.optSendungInVorbereitung.Location = New System.Drawing.Point(203, 3) Me.optSendungInVorbereitung.Name = "optSendungInVorbereitung" Me.optSendungInVorbereitung.Size = New System.Drawing.Size(143, 17) Me.optSendungInVorbereitung.TabIndex = 13 Me.optSendungInVorbereitung.Text = "Sendung in Vorbereitung" Me.optSendungInVorbereitung.UseVisualStyleBackColor = True + Me.optSendungInVorbereitung.Visible = False ' 'txtSonstigesDokumentFehlt ' Me.txtSonstigesDokumentFehlt.BackColor = System.Drawing.Color.White Me.txtSonstigesDokumentFehlt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtSonstigesDokumentFehlt.Location = New System.Drawing.Point(191, 95) + Me.txtSonstigesDokumentFehlt.Location = New System.Drawing.Point(184, 95) Me.txtSonstigesDokumentFehlt.MaxLength = 80 Me.txtSonstigesDokumentFehlt.Name = "txtSonstigesDokumentFehlt" Me.txtSonstigesDokumentFehlt.Size = New System.Drawing.Size(119, 20) @@ -290,7 +352,7 @@ Partial Class frmAddSendungsvermerkShort ' Me.optSpeditionWeitergeleitet.AutoSize = True Me.optSpeditionWeitergeleitet.BackColor = System.Drawing.Color.WhiteSmoke - Me.optSpeditionWeitergeleitet.Location = New System.Drawing.Point(12, 244) + Me.optSpeditionWeitergeleitet.Location = New System.Drawing.Point(12, 256) Me.optSpeditionWeitergeleitet.Name = "optSpeditionWeitergeleitet" Me.optSpeditionWeitergeleitet.Size = New System.Drawing.Size(163, 17) Me.optSpeditionWeitergeleitet.TabIndex = 19 @@ -301,7 +363,7 @@ Partial Class frmAddSendungsvermerkShort ' Me.optFreierText.AutoSize = True Me.optFreierText.BackColor = System.Drawing.Color.WhiteSmoke - Me.optFreierText.Location = New System.Drawing.Point(12, 267) + Me.optFreierText.Location = New System.Drawing.Point(12, 279) Me.optFreierText.Name = "optFreierText" Me.optFreierText.Size = New System.Drawing.Size(105, 17) Me.optFreierText.TabIndex = 27 @@ -311,17 +373,18 @@ Partial Class frmAddSendungsvermerkShort 'optATAangefordert ' Me.optATAangefordert.AutoSize = True - Me.optATAangefordert.Location = New System.Drawing.Point(12, 184) + Me.optATAangefordert.BackColor = System.Drawing.Color.WhiteSmoke + Me.optATAangefordert.Location = New System.Drawing.Point(164, 361) Me.optATAangefordert.Name = "optATAangefordert" - Me.optATAangefordert.Size = New System.Drawing.Size(211, 17) + Me.optATAangefordert.Size = New System.Drawing.Size(208, 17) Me.optATAangefordert.TabIndex = 15 - Me.optATAangefordert.Text = "ATA-Nr. fehlt - angefordert (Fremdanm.)" - Me.optATAangefordert.UseVisualStyleBackColor = True + Me.optATAangefordert.Text = "ATA/ATC-Nr. angefordert (Fremdanm.)" + Me.optATAangefordert.UseVisualStyleBackColor = False ' 'optVorkasseAngefordert ' Me.optVorkasseAngefordert.AutoSize = True - Me.optVorkasseAngefordert.Location = New System.Drawing.Point(12, 161) + Me.optVorkasseAngefordert.Location = New System.Drawing.Point(12, 186) Me.optVorkasseAngefordert.Name = "optVorkasseAngefordert" Me.optVorkasseAngefordert.Size = New System.Drawing.Size(144, 17) Me.optVorkasseAngefordert.TabIndex = 14 @@ -331,7 +394,7 @@ Partial Class frmAddSendungsvermerkShort 'optKontaktdatenAngefordert ' Me.optKontaktdatenAngefordert.AutoSize = True - Me.optKontaktdatenAngefordert.Location = New System.Drawing.Point(12, 138) + Me.optKontaktdatenAngefordert.Location = New System.Drawing.Point(12, 141) Me.optKontaktdatenAngefordert.Name = "optKontaktdatenAngefordert" Me.optKontaktdatenAngefordert.Size = New System.Drawing.Size(212, 17) Me.optKontaktdatenAngefordert.TabIndex = 12 @@ -342,7 +405,7 @@ Partial Class frmAddSendungsvermerkShort ' Me.Label3.AutoSize = True Me.Label3.BackColor = System.Drawing.Color.WhiteSmoke - Me.Label3.Location = New System.Drawing.Point(308, 245) + Me.Label3.Location = New System.Drawing.Point(308, 257) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(57, 13) Me.Label3.TabIndex = 22 @@ -352,7 +415,7 @@ Partial Class frmAddSendungsvermerkShort ' Me.lblErr240Zeichen.AutoSize = True Me.lblErr240Zeichen.ForeColor = System.Drawing.Color.Red - Me.lblErr240Zeichen.Location = New System.Drawing.Point(200, 305) + Me.lblErr240Zeichen.Location = New System.Drawing.Point(219, 403) Me.lblErr240Zeichen.Name = "lblErr240Zeichen" Me.lblErr240Zeichen.Size = New System.Drawing.Size(95, 13) Me.lblErr240Zeichen.TabIndex = 32 @@ -364,12 +427,12 @@ Partial Class frmAddSendungsvermerkShort Me.txtDetail.AcceptsReturn = True Me.txtDetail.BackColor = System.Drawing.Color.White Me.txtDetail.ForeColor = System.Drawing.SystemColors.InfoText - Me.txtDetail.Location = New System.Drawing.Point(12, 321) + Me.txtDetail.Location = New System.Drawing.Point(12, 419) Me.txtDetail.MaxLength = 240 Me.txtDetail.Multiline = True Me.txtDetail.Name = "txtDetail" Me.txtDetail.ScrollBars = System.Windows.Forms.ScrollBars.Vertical - Me.txtDetail.Size = New System.Drawing.Size(283, 54) + Me.txtDetail.Size = New System.Drawing.Size(302, 54) Me.txtDetail.TabIndex = 33 Me.txtDetail.TabStop = False Me.txtDetail.WordWrap = False @@ -377,7 +440,7 @@ Partial Class frmAddSendungsvermerkShort 'Label18 ' Me.Label18.AutoSize = True - Me.Label18.Location = New System.Drawing.Point(9, 305) + Me.Label18.Location = New System.Drawing.Point(9, 403) Me.Label18.Name = "Label18" Me.Label18.Size = New System.Drawing.Size(142, 13) Me.Label18.TabIndex = 31 @@ -387,7 +450,7 @@ Partial Class frmAddSendungsvermerkShort ' Me.txtSendungSpedition.BackColor = System.Drawing.Color.WhiteSmoke Me.txtSendungSpedition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtSendungSpedition.Location = New System.Drawing.Point(144, 242) + Me.txtSendungSpedition.Location = New System.Drawing.Point(144, 254) Me.txtSendungSpedition.MaxLength = 50 Me.txtSendungSpedition.Name = "txtSendungSpedition" Me.txtSendungSpedition.Size = New System.Drawing.Size(25, 20) @@ -408,7 +471,7 @@ Partial Class frmAddSendungsvermerkShort 'btnOK ' Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnOK.Location = New System.Drawing.Point(301, 321) + Me.btnOK.Location = New System.Drawing.Point(320, 419) Me.btnOK.Name = "btnOK" Me.btnOK.Size = New System.Drawing.Size(124, 54) Me.btnOK.TabIndex = 34 @@ -419,7 +482,7 @@ Partial Class frmAddSendungsvermerkShort ' Me.cbxSonstDok.AutoSize = True Me.cbxSonstDok.BackColor = System.Drawing.Color.WhiteSmoke - Me.cbxSonstDok.Location = New System.Drawing.Point(171, 98) + Me.cbxSonstDok.Location = New System.Drawing.Point(164, 98) Me.cbxSonstDok.Name = "cbxSonstDok" Me.cbxSonstDok.Size = New System.Drawing.Size(15, 14) Me.cbxSonstDok.TabIndex = 9 @@ -430,7 +493,7 @@ Partial Class frmAddSendungsvermerkShort Me.Label9.AutoSize = True Me.Label9.BackColor = System.Drawing.Color.WhiteSmoke Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) - Me.Label9.Location = New System.Drawing.Point(332, 285) + Me.Label9.Location = New System.Drawing.Point(332, 297) Me.Label9.Name = "Label9" Me.Label9.Size = New System.Drawing.Size(90, 13) Me.Label9.TabIndex = 30 @@ -440,7 +503,7 @@ Partial Class frmAddSendungsvermerkShort ' Me.cbxVollmacht.AutoSize = True Me.cbxVollmacht.BackColor = System.Drawing.Color.WhiteSmoke - Me.cbxVollmacht.Location = New System.Drawing.Point(171, 75) + Me.cbxVollmacht.Location = New System.Drawing.Point(164, 75) Me.cbxVollmacht.Name = "cbxVollmacht" Me.cbxVollmacht.Size = New System.Drawing.Size(72, 17) Me.cbxVollmacht.TabIndex = 7 @@ -451,7 +514,7 @@ Partial Class frmAddSendungsvermerkShort ' Me.cbxCMR.AutoSize = True Me.cbxCMR.BackColor = System.Drawing.Color.WhiteSmoke - Me.cbxCMR.Location = New System.Drawing.Point(171, 32) + Me.cbxCMR.Location = New System.Drawing.Point(164, 32) Me.cbxCMR.Name = "cbxCMR" Me.cbxCMR.Size = New System.Drawing.Size(50, 17) Me.cbxCMR.TabIndex = 3 @@ -463,7 +526,7 @@ Partial Class frmAddSendungsvermerkShort Me.Label17.AutoSize = True Me.Label17.BackColor = System.Drawing.Color.WhiteSmoke Me.Label17.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!, System.Drawing.FontStyle.Italic) - Me.Label17.Location = New System.Drawing.Point(119, 285) + Me.Label17.Location = New System.Drawing.Point(119, 297) Me.Label17.Name = "Label17" Me.Label17.Size = New System.Drawing.Size(182, 13) Me.Label17.TabIndex = 29 @@ -474,7 +537,7 @@ Partial Class frmAddSendungsvermerkShort Me.Label13.AutoSize = True Me.Label13.BackColor = System.Drawing.Color.WhiteSmoke Me.Label13.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label13.Location = New System.Drawing.Point(9, 217) + Me.Label13.Location = New System.Drawing.Point(9, 229) Me.Label13.Name = "Label13" Me.Label13.Size = New System.Drawing.Size(84, 17) Me.Label13.TabIndex = 16 @@ -484,11 +547,11 @@ Partial Class frmAddSendungsvermerkShort ' Me.cbxATR.AutoSize = True Me.cbxATR.BackColor = System.Drawing.Color.WhiteSmoke - Me.cbxATR.Location = New System.Drawing.Point(171, 52) + Me.cbxATR.Location = New System.Drawing.Point(164, 52) Me.cbxATR.Name = "cbxATR" - Me.cbxATR.Size = New System.Drawing.Size(124, 17) + Me.cbxATR.Size = New System.Drawing.Size(127, 17) Me.cbxATR.TabIndex = 5 - Me.cbxATR.Text = "ATR (Original/Kopie)" + Me.cbxATR.Text = "A.TR (Original/Kopie)" Me.cbxATR.UseVisualStyleBackColor = False ' 'cbxLS @@ -506,10 +569,10 @@ Partial Class frmAddSendungsvermerkShort ' Me.txtFreierText.BackColor = System.Drawing.Color.WhiteSmoke Me.txtFreierText.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtFreierText.Location = New System.Drawing.Point(122, 265) + Me.txtFreierText.Location = New System.Drawing.Point(122, 277) Me.txtFreierText.MaxLength = 80 Me.txtFreierText.Name = "txtFreierText" - Me.txtFreierText.Size = New System.Drawing.Size(302, 20) + Me.txtFreierText.Size = New System.Drawing.Size(322, 20) Me.txtFreierText.TabIndex = 28 ' 'cbxRechnung @@ -527,7 +590,7 @@ Partial Class frmAddSendungsvermerkShort ' Me.Label20.AutoSize = True Me.Label20.BackColor = System.Drawing.Color.WhiteSmoke - Me.Label20.Location = New System.Drawing.Point(267, 245) + Me.Label20.Location = New System.Drawing.Point(267, 257) Me.Label20.Name = "Label20" Me.Label20.Size = New System.Drawing.Size(0, 13) Me.Label20.TabIndex = 21 @@ -547,9 +610,9 @@ Partial Class frmAddSendungsvermerkShort ' Me.PictureBox4.BackColor = System.Drawing.Color.WhiteSmoke Me.PictureBox4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.PictureBox4.Location = New System.Drawing.Point(-1, 206) + Me.PictureBox4.Location = New System.Drawing.Point(-1, 218) Me.PictureBox4.Name = "PictureBox4" - Me.PictureBox4.Size = New System.Drawing.Size(435, 95) + Me.PictureBox4.Size = New System.Drawing.Size(453, 176) Me.PictureBox4.TabIndex = 78 Me.PictureBox4.TabStop = False ' @@ -559,7 +622,7 @@ Partial Class frmAddSendungsvermerkShort Me.PictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.PictureBox1.Location = New System.Drawing.Point(-1, -1) Me.PictureBox1.Name = "PictureBox1" - Me.PictureBox1.Size = New System.Drawing.Size(435, 130) + Me.PictureBox1.Size = New System.Drawing.Size(453, 130) Me.PictureBox1.TabIndex = 83 Me.PictureBox1.TabStop = False ' @@ -570,14 +633,14 @@ Partial Class frmAddSendungsvermerkShort Me.Panel4.Dock = System.Windows.Forms.DockStyle.Top Me.Panel4.Location = New System.Drawing.Point(0, 0) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(434, 0) + Me.Panel4.Size = New System.Drawing.Size(453, 0) Me.Panel4.TabIndex = 1 ' 'frmAddSendungsvermerkShort ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(434, 389) + Me.ClientSize = New System.Drawing.Size(453, 481) Me.Controls.Add(Me.pnlMain) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) @@ -636,5 +699,10 @@ Partial Class frmAddSendungsvermerkShort Friend WithEvents optUeberwachungsdok As System.Windows.Forms.CheckBox Friend WithEvents cbxRgBest As CheckBox Friend WithEvents Label4 As Label - Friend WithEvents Button2 As Button + Friend WithEvents optFremd_ATB As CheckBox + Friend WithEvents optFremd_SendungAvisiert As CheckBox + Friend WithEvents optFahrerKeinATR As CheckBox + Friend WithEvents optFrachtkostenAngefordert As CheckBox + Friend WithEvents optKundeNichtErreichbar As CheckBox + Friend WithEvents optAbsenderbestätigung As CheckBox End Class diff --git a/Aviso/frmAddSendungsvermerkShort.vb b/Aviso/frmAddSendungsvermerkShort.vb index 464ebce..e026fee 100644 --- a/Aviso/frmAddSendungsvermerkShort.vb +++ b/Aviso/frmAddSendungsvermerkShort.vb @@ -146,11 +146,19 @@ Public Class frmAddSendungsvermerkShort If cbxLS.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Lieferschein für Sendung '" & txtSendung.Text.Trim & "' fehlt - angefordert", 5) If cbxATR.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "ATR für Sendung '" & txtSendung.Text.Trim & "' fehlt - angefordert", 7) If cbxVollmacht.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Vollmacht für Sendung '" & txtSendung.Text.Trim & "' fehlt - angefordert", 9) - If cbxCMR.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "CMR für Fiskal VZ bei Sendung '" & txtSendung.Text.Trim & "' angefordert", 11) - If cbxRgBest.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Rechnungsbestätigung bei Sendung '" & txtSendung.Text.Trim & "' angefordert", 55) + If cbxCMR.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "CMR bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 11) + If cbxRgBest.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Rechnungsbestätigung bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 55) + + If optFrachtkostenAngefordert.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Frachtkosten bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 74) + If optAbsenderbestätigung.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Absenderbestätigung bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 76) + + If optKundeNichtErreichbar.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Kunde bei Sendung '" & txtSendung.Text.Trim & "' nicht erreichbar", 70) + If optFahrerKeinATR.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Fahrer ohne A.TR bei Sendung '" & txtSendung.Text.Trim & "'", 71) + If optFremd_ATB.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "ATB von Fremdeinsteller erhalten bei Sendung '" & txtSendung.Text.Trim & "' ", 72) + If optFremd_SendungAvisiert.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Sendung '" & txtSendung.Text.Trim & "' an Fremdeinsteller avisiert", 73) - If optUeberwachungsdok.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Ü-Dok bei Sendung '" & txtSendung.Text.Trim & "' angefordert", 53) + If optUeberwachungsdok.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Ü-Dok bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 53) If cbxSonstDok.Checked Then If txtSonstigesDokumentFehlt.Text.Trim = "" Then @@ -178,7 +186,7 @@ Public Class frmAddSendungsvermerkShort VermerkeDAL.UpdateSendungVorbereitet(AvisoID, SendungID, VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.MitarbeiterID, True) End If If optKontaktdatenAngefordert.Checked = True Then - insertSendungsVermerk(SendungID, myAviso.AvisoID, "Kontaktdaten bei Sendung '" & txtSendung.Text.Trim & "' angefordert", 36) + insertSendungsVermerk(SendungID, myAviso.AvisoID, "Kontaktdaten bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 36) End If ' If optSendungVorbereitet.Checked = True Then 'insertSendungsVermerk(SendungID,myAviso.AvisoID, "Sendung '" & txtSendung.Text.Trim & "' Vorbereitung abgeschlossen.", 32) @@ -186,7 +194,7 @@ Public Class frmAddSendungsvermerkShort 'End If If optATAangefordert.Checked = True Then - insertSendungsVermerk(SendungID, myAviso.AvisoID, "ATA-Nr. bei Sendung " & txtSendung.Text.Trim & " angefordert", 33) + insertSendungsVermerk(SendungID, myAviso.AvisoID, "ATA/ATC-Nr. bei Sendung " & txtSendung.Text.Trim & " - angefordert", 33) ' ElseIf optATAerhalten.Checked = True Then ' If txtSendung.Text.Trim = "" Then @@ -298,10 +306,10 @@ Public Class frmAddSendungsvermerkShort Private Sub frmAddSendungsvermerk_Shown(sender As Object, e As EventArgs) Handles Me.Shown - Dim p = System.Windows.Forms.Cursor.Position + Dim p = Cursor.Position If (p.X + Me.Width) > My.Computer.Screen.WorkingArea.Width Then p.X = My.Computer.Screen.WorkingArea.Width - Me.Width If (p.Y + Me.Height) > My.Computer.Screen.WorkingArea.Height Then p.Y = My.Computer.Screen.WorkingArea.Height - Me.Height - Me.Location = p '.Me.PointToClient(System.Windows.Forms.Cursor.Position) + Me.Location = p '.Me.PointToClient(System.Cursor.Position) txtSendung.SelectionLength = 0 cbxAuftrag.Focus() End Sub @@ -310,7 +318,7 @@ Public Class frmAddSendungsvermerkShort Me.Close() End Sub - Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click + Private Sub Button2_Click(sender As Object, e As EventArgs) If insertVermerke() Then VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.INSERT_BENACHRICHTIGUNG(myAviso.AvisoID, SendungID, 1, "T", 13, , 1) insertSendungsVermerk(SendungID, myAviso.AvisoID, "In die Neukunden-Abteilung gegeben.", 46) diff --git a/Aviso/frmAvisoWeiterleiten.vb b/Aviso/frmAvisoWeiterleiten.vb index bdb69df..f098563 100644 --- a/Aviso/frmAvisoWeiterleiten.vb +++ b/Aviso/frmAvisoWeiterleiten.vb @@ -261,7 +261,7 @@ Public Class frmAvisoWeiterleiten .Columns("mit_teamId").Visible = False .Columns("mit_id").Visible = False - .AutoSizeColumnsMode = Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells + .AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells End With End Sub @@ -310,7 +310,7 @@ Public Class frmAvisoWeiterleiten 'fd.Filter = "Image Files(*.BMP;*.JPG;*.GIF;*.PNG)|*.BMP;*.JPG;*.GIF;*.PNG" 'fd.FilterIndex = 2 - If fd.ShowDialog() = System.Windows.Forms.DialogResult.OK And fd.FileName <> "" Then + If fd.ShowDialog() = DialogResult.OK And fd.FileName <> "" Then ' saveFileAtt(fd.FileName) For Each fileTMp In fd.FileNames diff --git a/Aviso/frmChangePWD.Designer.vb b/Aviso/frmChangePWD.Designer.vb index e627843..25d3ccb 100644 --- a/Aviso/frmChangePWD.Designer.vb +++ b/Aviso/frmChangePWD.Designer.vb @@ -142,7 +142,7 @@ Partial Class frmChangePWD ' 'btnSpeichern ' - Me.btnSpeichern.DialogResult = System.Windows.Forms.DialogResult.OK + Me.btnSpeichern.DialogResult = DialogResult.OK Me.btnSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnSpeichern.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnSpeichern.Location = New System.Drawing.Point(12, 178) diff --git a/Aviso/frmChangePWD.vb b/Aviso/frmChangePWD.vb index 2aa8a6f..ab728ed 100644 --- a/Aviso/frmChangePWD.vb +++ b/Aviso/frmChangePWD.vb @@ -17,7 +17,7 @@ Me.Close() End If - Me.DialogResult = Windows.Forms.DialogResult.None + Me.DialogResult = DialogResult.None If PERSONAL.mit_pwd <> txtPwdOld.Text Then MsgBox("Altes Passwort falsch!") Exit Sub @@ -53,7 +53,7 @@ Dim sql As New VERAG_PROG_ALLGEMEIN.SQL If sql.doSQL("UPDATE tblMitarbeiter SET mit_pwd='" & txtPwdNew1.Text & "', mit_PasswortChanged=GETDATE() WHERE mit_id = '" & PERSONAL.mit_id & "'", "ADMIN") Then VERAG_PROG_ALLGEMEIN.cAllgemein.LOAD_DATA() 'Neu laden - Me.DialogResult = Windows.Forms.DialogResult.OK + Me.DialogResult = DialogResult.OK End If Else MsgBox("Neue Passwörter stimmen nicht überein!") diff --git a/Aviso/frmDokumenteSchicken.Designer.vb b/Aviso/frmDokumenteSchicken.Designer.vb index 59f1643..bfc1e49 100644 --- a/Aviso/frmDokumenteSchicken.Designer.vb +++ b/Aviso/frmDokumenteSchicken.Designer.vb @@ -66,7 +66,7 @@ Partial Class frmDokumenteSchicken ' 'btnOK ' - Me.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK + Me.btnOK.DialogResult = DialogResult.OK Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnOK.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!) Me.btnOK.Location = New System.Drawing.Point(81, 347) diff --git a/Aviso/frmEintragAviso.vb b/Aviso/frmEintragAviso.vb index a13c313..5dd1b9d 100644 --- a/Aviso/frmEintragAviso.vb +++ b/Aviso/frmEintragAviso.vb @@ -1459,20 +1459,20 @@ Public Class frmEintragAviso Private Sub dtpAvisoEingangZeit_PreviewKeyDown(sender As Object, e As PreviewKeyDownEventArgs) Handles dtpAvisoEingangZeit.PreviewKeyDown, kdFrächter.PreviewKeyDown, kdAuftraggeber.PreviewKeyDown, kdAvisierer.PreviewKeyDown, dtpAvisoEingangZeit.PreviewKeyDown, kdFrächter.PreviewKeyDown, kdAvisierer.PreviewKeyDown, dtpAvisoEingangZeit.PreviewKeyDown, kdFrächter.PreviewKeyDown, kdAvisierer.PreviewKeyDown, dtpAvisoEingangZeit.PreviewKeyDown, kdFrächter.PreviewKeyDown, kdAvisierer.PreviewKeyDown, dtpAvisoEingangZeit.PreviewKeyDown, kdFrächter.PreviewKeyDown, kdAvisierer.PreviewKeyDown, txtBestimmungszollstelle.PreviewKeyDown If e.KeyCode = Keys.Return Then - e.IsInputKey = True : Me.DialogResult = Windows.Forms.DialogResult.None - If sender Is kdAvisierer Then kdAvisierer.FireReturn() : e.IsInputKey = True : Me.DialogResult = Windows.Forms.DialogResult.None - If sender Is kdAuftraggeber Then kdAuftraggeber.FireReturn() : e.IsInputKey = True : Me.DialogResult = Windows.Forms.DialogResult.None - If sender Is kdFrächter Then kdFrächter.FireReturn() : e.IsInputKey = True : Me.DialogResult = Windows.Forms.DialogResult.None - If sender Is UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle1 Then UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle1.FireReturn() : e.IsInputKey = True : Me.DialogResult = Windows.Forms.DialogResult.None - If sender Is UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle2 Then UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle2.FireReturn() : e.IsInputKey = True : Me.DialogResult = Windows.Forms.DialogResult.None - If sender Is UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle3 Then UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle3.FireReturn() : e.IsInputKey = True : Me.DialogResult = Windows.Forms.DialogResult.None - If sender Is UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle4 Then UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle4.FireReturn() : e.IsInputKey = True : Me.DialogResult = Windows.Forms.DialogResult.None - If sender Is UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle5 Then UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle5.FireReturn() : e.IsInputKey = True : Me.DialogResult = Windows.Forms.DialogResult.None - If sender Is UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle6 Then UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle6.FireReturn() : e.IsInputKey = True : Me.DialogResult = Windows.Forms.DialogResult.None - If sender Is txtBestimmungszollstelle Then txtBestimmungszollstelle.FireReturn() : e.IsInputKey = True : Me.DialogResult = Windows.Forms.DialogResult.None + e.IsInputKey = True : Me.DialogResult = DialogResult.None + If sender Is kdAvisierer Then kdAvisierer.FireReturn() : e.IsInputKey = True : Me.DialogResult = DialogResult.None + If sender Is kdAuftraggeber Then kdAuftraggeber.FireReturn() : e.IsInputKey = True : Me.DialogResult = DialogResult.None + If sender Is kdFrächter Then kdFrächter.FireReturn() : e.IsInputKey = True : Me.DialogResult = DialogResult.None + If sender Is UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle1 Then UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle1.FireReturn() : e.IsInputKey = True : Me.DialogResult = DialogResult.None + If sender Is UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle2 Then UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle2.FireReturn() : e.IsInputKey = True : Me.DialogResult = DialogResult.None + If sender Is UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle3 Then UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle3.FireReturn() : e.IsInputKey = True : Me.DialogResult = DialogResult.None + If sender Is UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle4 Then UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle4.FireReturn() : e.IsInputKey = True : Me.DialogResult = DialogResult.None + If sender Is UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle5 Then UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle5.FireReturn() : e.IsInputKey = True : Me.DialogResult = DialogResult.None + If sender Is UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle6 Then UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle6.FireReturn() : e.IsInputKey = True : Me.DialogResult = DialogResult.None + If sender Is txtBestimmungszollstelle Then txtBestimmungszollstelle.FireReturn() : e.IsInputKey = True : Me.DialogResult = DialogResult.None e.IsInputKey = True - Me.DialogResult = Windows.Forms.DialogResult.None + Me.DialogResult = DialogResult.None ElseIf e.KeyCode = Keys.Tab And sender Is dtpAvisoEingangZeit Then End If diff --git a/Aviso/frmGelangensbestaetigung.Designer.vb b/Aviso/frmGelangensbestaetigung.Designer.vb index 75e58cc..6fef9d5 100644 --- a/Aviso/frmGelangensbestaetigung.Designer.vb +++ b/Aviso/frmGelangensbestaetigung.Designer.vb @@ -106,7 +106,7 @@ Partial Class frmGelangensbestaetigung ' 'btnOK ' - Me.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK + Me.btnOK.DialogResult = DialogResult.OK Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnOK.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnOK.Location = New System.Drawing.Point(449, 48) diff --git a/Aviso/frmGenerelleGestellungen.vb b/Aviso/frmGenerelleGestellungen.vb index b9c1f28..d59a8c4 100644 --- a/Aviso/frmGenerelleGestellungen.vb +++ b/Aviso/frmGenerelleGestellungen.vb @@ -61,7 +61,7 @@ Public Class frmGenerelleGestellungen Dim fd As New OpenFileDialog fd.Filter = "PDF Dateien|*.pdf;" - If fd.ShowDialog() = System.Windows.Forms.DialogResult.OK Then + If fd.ShowDialog() = DialogResult.OK Then If Not fd.FileName.EndsWith(".pdf") And Not fd.FileName.EndsWith(".PDF") Then Me.Cursor = Cursors.Default MsgBox("Falsches Format, bitte .PDF-Datei auswählen!") @@ -73,7 +73,7 @@ Public Class frmGenerelleGestellungen value = InputBox("Bitte geben Sie einen Namen für das Dokument ein:", "File - Name", System.IO.Path.GetFileName(fd.FileName), 200, 100) If Not value.ToUpper.EndsWith(".PDF") Then value &= ".pdf" - If value.Chars(0) = "S" Then + If value.Chars(0) = "S" Then If value.ToUpper.StartsWith("SCH") Then : path = "\\192.168.0.91\f\VERAG Vorlagen Quickstop\Generelle Gestellungen\SCH\" ElseIf value.Chars(0) = "ST" Then : path = "\\192.168.0.91\f\VERAG Vorlagen Quickstop\Generelle Gestellungen\ST\" Else : path = "\\192.168.0.91\f\VERAG Vorlagen Quickstop\Generelle Gestellungen\S\" diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index a59da64..6b861a5 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -124,7 +124,7 @@ Public Class frmHauptfenster Private Sub frmMain_Load(sender As System.Object, e As System.EventArgs) Handles MyBase.Load 'MsgBox(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM) - Me.AutoScaleMode = Windows.Forms.AutoScaleMode.Dpi + Me.AutoScaleMode = AutoScaleMode.Dpi hideErr.Interval = 3000 'Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA @@ -775,7 +775,7 @@ Public Class frmHauptfenster End If hSQL += " ORDER BY Ankunft ASC, AvisoEingang ASC, Datum ASC" - + MsgBox(hSQL) 'If hSort = "" Then 'hSQL += " ORDER BY Ankunft DESC, AvisoEingang DESC, Datum DESC" ' Else @@ -2077,12 +2077,12 @@ Public Class frmHauptfenster End If - If e.Button = Windows.Forms.MouseButtons.Right Then + If e.Button = MouseButtons.Right Then If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then If sender Is gridAviso Then VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = tmpId sender.CurrentCell = sender.Rows(e.RowIndex).Cells(e.ColumnIndex) - conMenuAviso.Show(Windows.Forms.Cursor.Position) + conMenuAviso.Show(Cursor.Position) End If Else setAkive_AuswahlID() @@ -2098,13 +2098,13 @@ Public Class frmHauptfenster Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm() Dim sv As New frmAddAktenvermerkShort(tmpId) - sv.Location = Me.PointToClient(System.Windows.Forms.Cursor.Position) + sv.Location = Me.PointToClient(Cursor.Position) ' sv.ShowDialog() sv.ShowDialog(frmGrayOut) frmGrayOut.Close() End If - ElseIf e.Button = Windows.Forms.MouseButtons.Left Then + ElseIf e.Button = MouseButtons.Left Then VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = tmpId avisoAktualisierenAktiveIdBehalten(tmpId, , False) End If @@ -3027,7 +3027,7 @@ Public Class frmHauptfenster Private Sub NeuesPasswortToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles NeuesPasswortToolStripMenuItem.Click Dim f As New frmChangePWD(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER) - If f.ShowDialog() = Windows.Forms.DialogResult.OK Then + If f.ShowDialog() = DialogResult.OK Then MsgBox("Passwort geändert!", vbInformation) 'Dim frmSecureLoginKassenbuch As New SDL.frmSecureLoginKassenbuch() 'frmSecureLoginKassenbuch.openKB = True diff --git a/Aviso/frmKundenFremdeSpedAdd.vb b/Aviso/frmKundenFremdeSpedAdd.vb index b21de82..716c759 100644 --- a/Aviso/frmKundenFremdeSpedAdd.vb +++ b/Aviso/frmKundenFremdeSpedAdd.vb @@ -35,13 +35,13 @@ Public Class frmKundenFremdeSpedAdd FREMD.fremdz_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME If FREMD.SAVE() Then - Me.DialogResult = Windows.Forms.DialogResult.OK + Me.DialogResult = DialogResult.OK Me.Close() End If End Sub Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click - Me.DialogResult = Windows.Forms.DialogResult.Cancel + Me.DialogResult = DialogResult.Cancel Me.Close() End Sub diff --git a/Aviso/frmLKWBericht.Designer.vb b/Aviso/frmLKWBericht.Designer.vb index 1c691a2..986cae1 100644 --- a/Aviso/frmLKWBericht.Designer.vb +++ b/Aviso/frmLKWBericht.Designer.vb @@ -48,7 +48,7 @@ Partial Class frmLKWBericht ' 'Button2 ' - Me.Button2.DialogResult = System.Windows.Forms.DialogResult.Cancel + Me.Button2.DialogResult = DialogResult.Cancel Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button2.Location = New System.Drawing.Point(16, 153) Me.Button2.Name = "Button2" diff --git a/Aviso/frmLogin.vb b/Aviso/frmLogin.vb index 1a1bdde..d28a4a5 100644 --- a/Aviso/frmLogin.vb +++ b/Aviso/frmLogin.vb @@ -307,7 +307,7 @@ Public Class frmLogin Dim f As New frmChangePWD(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER) f.txtPwdOld.Text = txtKennwort.Text f.txtPwdNew1.Focus() - If f.ShowDialog() <> Windows.Forms.DialogResult.OK Then + If f.ShowDialog() <> DialogResult.OK Then Exit Sub End If End If diff --git a/Aviso/frmSendungsDetailsAbrechnungLeistungen.vb b/Aviso/frmSendungsDetailsAbrechnungLeistungen.vb index ff9980f..f874600 100644 --- a/Aviso/frmSendungsDetailsAbrechnungLeistungen.vb +++ b/Aviso/frmSendungsDetailsAbrechnungLeistungen.vb @@ -45,7 +45,7 @@ Private Sub usrcntlSendungDetailsAbrechnung_Load(sender As Object, e As EventArgs) Handles Me.Load loadDgv() dgv.ClearSelection() - Me.Location = Windows.Forms.Cursor.Position + Me.Location = Cursor.Position End Sub Private Sub usrcntlSendungDetailsAbrechnung_LostFocus(sender As Object, e As EventArgs) Handles dgv.LostFocus diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index 2b4c92a..a5d6272 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -2105,7 +2105,7 @@ Public Class frmSendungsdetailsNEU SAVE_ME() Dim PERSONAL As SDL.cPersonal = Nothing Dim frmSecureLoginKassenbuch As New SDL.frmSecureLoginKassenbuch - If frmSecureLoginKassenbuch.ShowDialog(Me) = Windows.Forms.DialogResult.OK Then + If frmSecureLoginKassenbuch.ShowDialog(Me) = DialogResult.OK Then PERSONAL = frmSecureLoginKassenbuch.PERSONAL Dim frmBeleg As New SDL.frmBelegNeu(PERSONAL, Nothing, "E") frmBeleg.AvisoID = AvisoId @@ -2136,7 +2136,7 @@ Public Class frmSendungsdetailsNEU End Sub - If frmBeleg.ShowDialog(Me) = Windows.Forms.DialogResult.OK Then + If frmBeleg.ShowDialog(Me) = DialogResult.OK Then If frmBeleg.BELEG.gebucht Then @@ -2263,7 +2263,7 @@ Public Class frmSendungsdetailsNEU ' frmSecureLoginKassenbuch.KassenbuchNr_tmp = PERSONAL.KassenbuchNr - If frmSecureLoginKassenbuch.ShowDialog(Me) = Windows.Forms.DialogResult.OK Then + If frmSecureLoginKassenbuch.ShowDialog(Me) = DialogResult.OK Then PERSONAL = frmSecureLoginKassenbuch.PERSONAL Dim frmNacherfassungLeihgeld As New SDL.frmNacherfassungLeihgeld(PERSONAL, frmSecureLoginKassenbuch.PERSONAL_LG) @@ -2319,7 +2319,7 @@ Public Class frmSendungsdetailsNEU 'If sender Is Button13 Then frmNacherfassungLeihgeld.AddDusche(True) End Sub - If frmNacherfassungLeihgeld.ShowDialog(Me) = Windows.Forms.DialogResult.OK Then + If frmNacherfassungLeihgeld.ShowDialog(Me) = DialogResult.OK Then If frmNacherfassungLeihgeld.BELEG.FilialenNr > 0 And frmNacherfassungLeihgeld.BELEG.AbfertigungsNr > 0 Then loadDataInLIST() @@ -2398,7 +2398,7 @@ Public Class frmSendungsdetailsNEU frmGB.KdSearchBox1.Text = SND_TMP.tblSnd_Absender frmGB.KdSearchBox2.Text = SND_TMP.tblSnd_Empfaenger - If frmGB.ShowDialog(Me) = Windows.Forms.DialogResult.OK Then + If frmGB.ShowDialog(Me) = DialogResult.OK Then SND_TMP.tblSnd_Absender = frmGB.KdSearchBox1.Text SND_TMP.tblSnd_Empfaenger = frmGB.KdSearchBox2.Text @@ -3097,7 +3097,7 @@ Public Class frmSendungsdetailsNEU If dgvBelege.SelectedRows.Count <= 0 Then Exit Sub Dim frmSecureLoginKassenbuch As New SDL.frmSecureLoginKassenbuch - If frmSecureLoginKassenbuch.ShowDialog(Me) = Windows.Forms.DialogResult.OK Then + If frmSecureLoginKassenbuch.ShowDialog(Me) = DialogResult.OK Then Dim PERSONAL As SDL.cPersonal = frmSecureLoginKassenbuch.PERSONAL Dim sqlTMP As New SDL.FMZOLL_SQL @@ -3143,7 +3143,7 @@ Public Class frmSendungsdetailsNEU Private Sub Button15_Click(sender As Object, e As EventArgs) Handles btnVorauszahlung.Click FormularArt = SDL.FormularManagerArten.Importaviso_VK - cntxtVorauskasse.Show(Windows.Forms.Cursor.Position) + cntxtVorauskasse.Show(Cursor.Position) End Sub Private Sub FrächterToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles toolAbsender.Click, toolAuftraggeber.Click, toolEmpfänger.Click, toolAvisierer.Click, toolFrächter.Click @@ -3176,7 +3176,7 @@ Public Class frmSendungsdetailsNEU End Sub Private Sub Button13_Click(sender As Object, e As EventArgs) Handles Button13.Click - cntxtOptions.Show(Windows.Forms.Cursor.Position) + cntxtOptions.Show(Cursor.Position) End Sub @@ -3185,10 +3185,10 @@ Public Class frmSendungsdetailsNEU Dim f As New frmSendungsDetailsAbrechnungLeistungen(SENDUNG_LIST(CURRENT_INDEX), sender._beteiligter) ' Dim p As Point = Cursor.Position ' p.Offset(-f.Width \ 2, -f.Height \ 2) - ' f.Location = Windows.Forms.Cursor.Position + ' f.Location = Cursor.Position - ' f.Left = Me.PointToScreen(System.Windows.Forms.Cursor.Position).X - ' f.Top = Me.PointToScreen(System.Windows.Forms.Cursor.Position).Y + ' f.Left = Me.PointToScreen(System.Cursor.Position).X + ' f.Top = Me.PointToScreen(System.Cursor.Position).Y f.ShowDialog() SAVE_ABRECHUNG() LOAD_ABRECHUNG() @@ -3200,7 +3200,7 @@ Public Class frmSendungsdetailsNEU Private Sub Button14_Click_2(sender As Object, e As EventArgs) Handles Button14.Click Dim f As New frmWarenbezeichnungBegriffe - If f.ShowDialog(Me) = Windows.Forms.DialogResult.OK Then + If f.ShowDialog(Me) = DialogResult.OK Then If f.WB IsNot Nothing Then rtbWarenbezeichnung.Text = f.WB.wb_begriff End If @@ -3346,7 +3346,7 @@ Public Class frmSendungsdetailsNEU Private Sub Button11_Click(sender As Object, e As EventArgs) Handles btnImportaviso.Click FormularArt = SDL.FormularManagerArten.Importaviso - cntxtVorauskasse.Show(Windows.Forms.Cursor.Position) + cntxtVorauskasse.Show(Cursor.Position) End Sub Private Sub ToolStripMenuItem10_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem10.Click @@ -3417,7 +3417,7 @@ Public Class frmSendungsdetailsNEU Private Sub Button17_Click(sender As Object, e As EventArgs) Handles Button17.Click Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm() Dim sv As New frmAddSendungsvermerkShort(AvisoId, SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID) ', dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value) - sv.Location = Me.PointToClient(System.Windows.Forms.Cursor.Position) + sv.Location = Me.PointToClient(Cursor.Position) sv.ShowDialog(frmGrayOut) frmGrayOut.Close() sv.Close() @@ -3553,7 +3553,7 @@ Public Class frmSendungsdetailsNEU Private Sub Button21_Click(sender As Object, e As EventArgs) Handles Button21.Click FormularArt = SDL.FormularManagerArten.Importaviso_VK - ctxtWeitereFormulare.Show(Windows.Forms.Cursor.Position) + ctxtWeitereFormulare.Show(Cursor.Position) End Sub Private Sub EmpfängerToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EmpfängerToolStripMenuItem.Click diff --git a/Aviso/frmTabelleStandorte.designer.vb b/Aviso/frmTabelleStandorte.designer.vb index bcb98a0..04c7d17 100644 --- a/Aviso/frmTabelleStandorte.designer.vb +++ b/Aviso/frmTabelleStandorte.designer.vb @@ -84,7 +84,7 @@ Partial Class frmTabelleStandorte ' 'btnBeenden ' - Me.btnBeenden.DialogResult = System.Windows.Forms.DialogResult.Cancel + Me.btnBeenden.DialogResult = DialogResult.Cancel Me.btnBeenden.Location = New System.Drawing.Point(10, 225) Me.btnBeenden.Name = "btnBeenden" Me.btnBeenden.Size = New System.Drawing.Size(100, 35) diff --git a/Aviso/frmTv.Designer.vb b/Aviso/frmTv.Designer.vb index 27f808d..0ebda45 100644 --- a/Aviso/frmTv.Designer.vb +++ b/Aviso/frmTv.Designer.vb @@ -126,7 +126,7 @@ Partial Class frmTv ' 'btnAbbrechen ' - Me.btnAbbrechen.DialogResult = System.Windows.Forms.DialogResult.Cancel + Me.btnAbbrechen.DialogResult = DialogResult.Cancel Me.btnAbbrechen.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnAbbrechen.Location = New System.Drawing.Point(60, 247) Me.btnAbbrechen.Name = "btnAbbrechen" @@ -137,7 +137,7 @@ Partial Class frmTv ' 'btnOK ' - Me.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK + Me.btnOK.DialogResult = DialogResult.OK Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnOK.Location = New System.Drawing.Point(183, 247) Me.btnOK.Name = "btnOK" diff --git a/Aviso/frmTv.vb b/Aviso/frmTv.vb index 464b804..1fe7c5d 100644 --- a/Aviso/frmTv.vb +++ b/Aviso/frmTv.vb @@ -9,7 +9,7 @@ Public Class frmTv Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click lblAndererText.ForeColor = Color.Black - If txt.Text = "" Then lblAndererText.ForeColor = Color.Red : Me.DialogResult = Windows.Forms.DialogResult.None : Exit Sub + If txt.Text = "" Then lblAndererText.ForeColor = Color.Red : Me.DialogResult = DialogResult.None : Exit Sub If avisoID > 0 Then AVISO.UpdateAvisoTVHinweis(avisoID, txt.Text) End If diff --git a/Aviso/frmWarenbezeichnungBegriffe.vb b/Aviso/frmWarenbezeichnungBegriffe.vb index 277fb81..34d2c2a 100644 --- a/Aviso/frmWarenbezeichnungBegriffe.vb +++ b/Aviso/frmWarenbezeichnungBegriffe.vb @@ -37,7 +37,7 @@ Sub selectWB() If dgvWB.SelectedRows.Count > 0 Then WB = New VERAG_PROG_ALLGEMEIN.cWarenbezeichnungBegriffe(dgvWB.SelectedRows(0).Cells("wb_id").Value) - Me.DialogResult = Windows.Forms.DialogResult.OK + Me.DialogResult = DialogResult.OK Me.Close() End If End Sub diff --git a/Aviso/usrCntlEintragAvisoAtilla.vb b/Aviso/usrCntlEintragAvisoAtilla.vb index 0242bd9..947299f 100644 --- a/Aviso/usrCntlEintragAvisoAtilla.vb +++ b/Aviso/usrCntlEintragAvisoAtilla.vb @@ -34,7 +34,7 @@ Private Sub dtpAvisoEingangZeit_PreviewKeyDown(sender As Object, e As PreviewKeyDownEventArgs) Handles sbDurchgangszollstelle1.PreviewKeyDown, sbDurchgangszollstelle2.PreviewKeyDown, sbDurchgangszollstelle3.PreviewKeyDown, sbDurchgangszollstelle4.PreviewKeyDown, sbDurchgangszollstelle5.PreviewKeyDown, sbDurchgangszollstelle6.PreviewKeyDown If e.KeyCode = Keys.Return Then - e.IsInputKey = True ': Me.DialogResult = Windows.Forms.DialogResult.None + e.IsInputKey = True ': Me.DialogResult = DialogResult.None If sender Is sbDurchgangszollstelle1 Then sbDurchgangszollstelle1.FireReturn() : e.IsInputKey = True If sender Is sbDurchgangszollstelle2 Then sbDurchgangszollstelle2.FireReturn() : e.IsInputKey = True If sender Is sbDurchgangszollstelle3 Then sbDurchgangszollstelle3.FireReturn() : e.IsInputKey = True diff --git a/Aviso/usrcntlAktDetails.Designer.vb b/Aviso/usrcntlAktDetails.Designer.vb index 42f5c6f..500a07f 100644 --- a/Aviso/usrcntlAktDetails.Designer.vb +++ b/Aviso/usrcntlAktDetails.Designer.vb @@ -23,17 +23,17 @@ Partial Class usrcntlAktDetails _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrcntlAktDetails)) - Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.pnlDetailsRechts = New System.Windows.Forms.Panel() Me.Panel3 = New System.Windows.Forms.Panel() Me.SplitContainer = New System.Windows.Forms.SplitContainer() @@ -135,15 +135,17 @@ Partial Class usrcntlAktDetails Me.conMenuVermerke = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.conVermerkLöschen = New System.Windows.Forms.ToolStripMenuItem() Me.HervorhebenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolUeberweisungsBeleg = New System.Windows.Forms.ToolStripMenuItem() + Me.toolVkReminder = New System.Windows.Forms.ToolStripMenuItem() Me.cntxtFormulare = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DispolisteTRToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DispolisteENToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.pnlOptionen = New System.Windows.Forms.Panel() + Me.Button13 = New System.Windows.Forms.Button() Me.Button14 = New System.Windows.Forms.Button() Me.btnLöschen = New System.Windows.Forms.Button() Me.btnÄndern = New System.Windows.Forms.Button() Me.btnTV = New System.Windows.Forms.Button() - Me.Button13 = New System.Windows.Forms.Button() Me.pnlDetailsRechts.SuspendLayout() Me.Panel3.SuspendLayout() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() @@ -555,44 +557,44 @@ Partial Class usrcntlAktDetails Me.dgvSendungen.AllowUserToAddRows = False Me.dgvSendungen.AllowUserToDeleteRows = False Me.dgvSendungen.AllowUserToResizeRows = False - DataGridViewCellStyle21.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSendungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle21 + DataGridViewCellStyle11.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSendungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11 Me.dgvSendungen.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle22.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle22.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSendungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle22 + DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle12.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle12.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSendungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle12 Me.dgvSendungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - DataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvSendungen.DefaultCellStyle = DataGridViewCellStyle23 + DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvSendungen.DefaultCellStyle = DataGridViewCellStyle13 Me.dgvSendungen.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvSendungen.Location = New System.Drawing.Point(0, 0) Me.dgvSendungen.MultiSelect = False Me.dgvSendungen.Name = "dgvSendungen" Me.dgvSendungen.ReadOnly = True - DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSendungen.RowHeadersDefaultCellStyle = DataGridViewCellStyle24 + DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSendungen.RowHeadersDefaultCellStyle = DataGridViewCellStyle14 Me.dgvSendungen.RowHeadersVisible = False Me.dgvSendungen.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSendungen.RowsDefaultCellStyle = DataGridViewCellStyle25 + DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSendungen.RowsDefaultCellStyle = DataGridViewCellStyle15 Me.dgvSendungen.RowTemplate.Height = 20 Me.dgvSendungen.RowTemplate.ReadOnly = True Me.dgvSendungen.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] @@ -819,44 +821,44 @@ Partial Class usrcntlAktDetails Me.gridVermerke.AllowUserToAddRows = False Me.gridVermerke.AllowUserToDeleteRows = False Me.gridVermerke.AllowUserToResizeRows = False - DataGridViewCellStyle26.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle26 + DataGridViewCellStyle16.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle16 Me.gridVermerke.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle27.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle27.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle27 + DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle17.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle17.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle17 Me.gridVermerke.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - DataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle28.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridVermerke.DefaultCellStyle = DataGridViewCellStyle28 + DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridVermerke.DefaultCellStyle = DataGridViewCellStyle18 Me.gridVermerke.Dock = System.Windows.Forms.DockStyle.Fill Me.gridVermerke.Location = New System.Drawing.Point(0, 30) Me.gridVermerke.MultiSelect = False Me.gridVermerke.Name = "gridVermerke" Me.gridVermerke.ReadOnly = True - DataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle29.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.RowHeadersDefaultCellStyle = DataGridViewCellStyle29 + DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.RowHeadersDefaultCellStyle = DataGridViewCellStyle19 Me.gridVermerke.RowHeadersVisible = False Me.gridVermerke.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle30 + DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle20 Me.gridVermerke.RowTemplate.Height = 20 Me.gridVermerke.RowTemplate.ReadOnly = True Me.gridVermerke.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] @@ -1635,22 +1637,38 @@ Partial Class usrcntlAktDetails ' 'conMenuVermerke ' - Me.conMenuVermerke.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.conVermerkLöschen, Me.HervorhebenToolStripMenuItem}) + Me.conMenuVermerke.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.conVermerkLöschen, Me.HervorhebenToolStripMenuItem, Me.ToolUeberweisungsBeleg, Me.toolVkReminder}) Me.conMenuVermerke.Name = "conMenuVermerke" - Me.conMenuVermerke.Size = New System.Drawing.Size(186, 48) + Me.conMenuVermerke.Size = New System.Drawing.Size(244, 92) ' 'conVermerkLöschen ' Me.conVermerkLöschen.Name = "conVermerkLöschen" - Me.conVermerkLöschen.Size = New System.Drawing.Size(185, 22) + Me.conVermerkLöschen.Size = New System.Drawing.Size(243, 22) Me.conVermerkLöschen.Text = "Vermerk löschen" ' 'HervorhebenToolStripMenuItem ' Me.HervorhebenToolStripMenuItem.Name = "HervorhebenToolStripMenuItem" - Me.HervorhebenToolStripMenuItem.Size = New System.Drawing.Size(185, 22) + Me.HervorhebenToolStripMenuItem.Size = New System.Drawing.Size(243, 22) Me.HervorhebenToolStripMenuItem.Text = "Hervorheben ein/aus" ' + 'ToolUeberweisungsBeleg + ' + Me.ToolUeberweisungsBeleg.Image = CType(resources.GetObject("ToolUeberweisungsBeleg.Image"), System.Drawing.Image) + Me.ToolUeberweisungsBeleg.Name = "ToolUeberweisungsBeleg" + Me.ToolUeberweisungsBeleg.Size = New System.Drawing.Size(243, 22) + Me.ToolUeberweisungsBeleg.Text = "VK: Überweisungsbeleg erhalten" + Me.ToolUeberweisungsBeleg.Visible = False + ' + 'toolVkReminder + ' + Me.toolVkReminder.Image = Global.AVISO.My.Resources.Resources.urgent + Me.toolVkReminder.Name = "toolVkReminder" + Me.toolVkReminder.Size = New System.Drawing.Size(243, 22) + Me.toolVkReminder.Text = "VK: Reminder geschickt" + Me.toolVkReminder.Visible = False + ' 'cntxtFormulare ' Me.cntxtFormulare.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DispolisteTRToolStripMenuItem, Me.DispolisteENToolStripMenuItem}) @@ -1685,6 +1703,22 @@ Partial Class usrcntlAktDetails Me.pnlOptionen.TabIndex = 82 Me.pnlOptionen.Visible = False ' + 'Button13 + ' + Me.Button13.BackColor = System.Drawing.Color.White + Me.Button13.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.Button13.ForeColor = System.Drawing.Color.Black + Me.Button13.ImageAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button13.Location = New System.Drawing.Point(3, 124) + Me.Button13.Name = "Button13" + Me.Button13.Size = New System.Drawing.Size(109, 28) + Me.Button13.TabIndex = 102 + Me.Button13.TabStop = False + Me.Button13.Text = "Freigabe Mail" + Me.Button13.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button13.UseVisualStyleBackColor = False + ' 'Button14 ' Me.Button14.BackColor = System.Drawing.Color.White @@ -1747,22 +1781,6 @@ Partial Class usrcntlAktDetails Me.btnTV.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnTV.UseVisualStyleBackColor = False ' - 'Button13 - ' - Me.Button13.BackColor = System.Drawing.Color.White - Me.Button13.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.Button13.ForeColor = System.Drawing.Color.Black - Me.Button13.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button13.Location = New System.Drawing.Point(3, 124) - Me.Button13.Name = "Button13" - Me.Button13.Size = New System.Drawing.Size(109, 28) - Me.Button13.TabIndex = 102 - Me.Button13.TabStop = False - Me.Button13.Text = "Freigabe Mail" - Me.Button13.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button13.UseVisualStyleBackColor = False - ' 'usrcntlAktDetails ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -1928,4 +1946,6 @@ Partial Class usrcntlAktDetails Friend WithEvents Button14 As Button Friend WithEvents lblBarZuKassierenSumme As Label Friend WithEvents Button13 As Button + Friend WithEvents ToolUeberweisungsBeleg As ToolStripMenuItem + Friend WithEvents toolVkReminder As ToolStripMenuItem End Class diff --git a/Aviso/usrcntlAktDetails.resx b/Aviso/usrcntlAktDetails.resx index e0c388c..1cd195e 100644 --- a/Aviso/usrcntlAktDetails.resx +++ b/Aviso/usrcntlAktDetails.resx @@ -169,6 +169,51 @@ 17, 17 + + + /9j/4AAQSkZJRgABAQEAYABgAAD/2wBDAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEB + AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/2wBDAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEB + AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/wAARCAAeAB4DASIAAhEBAxEB/8QA + HwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIh + MUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVW + V1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXG + x8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQF + BgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAV + YnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOE + hYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq + 8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD9NPg7+yD/AME5/j//AMPZf2z/APgpVoB8Wf8ACk/+Cl/7WXw5 + vvi347+Mnxz0H/hGfhF8N/8AhXGlfDnwJY6b4E+IOjf2z/Y39s2/gr4c+F9K0XVfE2o/afC/w78IWN95 + Phjw/F4B+yj8Gf8AgjV+178fvgx8P/An/BH/APay8E/s+/H3RvGmlfDP9qj4qfEj9ovw34D174x+A9G+ + InjHXvh1Z/2P8cPEvgnVNGXwV8K/HE1v4n8P/FPWvFP/AAmmhaj4Uu/hlZ6Vpmr+MNO479qv4VfGP4of + 8Ezv+CwFx8JL3WW034Yf8F4P2pvip8ZfDGg3Hik3vjP4OeHLXwppmt2c+i+GtO1CDxDo3grxXr3gv4ve + I7fxU2n+FvDnh74b6p4+vNQg1LwfpKS+yf8ABv1pHxIb4ofCTxp8Vv8Agp78M/jR8OtX+AWveHPgV+xZ + pX7afxsufih8PfHujRaLpsOg+JP2UfGUfg3Qp9F+F/ww8O/E7SoNLj03xh4K0uK10H4h/D2DV/D2meE/ + iDpv9LYn63huGuI86hxJn0auCqSy3LssweeZ5g8JlUcNkOFq4VYfCZdONCNZ1aqxTjipwwX1OhOEKbqO + pKH5pS9lVzLLcE8twDjWhHE4jE1sDgq1XFurj5wq+0q4iLqOKjF0k6SlWdapFykoqKl7X/wVZ/4JSfsG + fsPfsI/GL9q/9lX4Kap8H/2hfgn4g+Bfir4V/E7RfjN8eNX1nwV4kl/aE+FWijXNJsvFXxO17Q/7TtrD + Vb1bC8utKuZtNu3h1LT2ttStLS7g/qlr8/8A/gqT8Ofgj8Vf2Evjp4P/AGkviq/wW+A4X4a+LPin8QLa + GzuNXtPCPw7+L3gD4hah4Z8LwX0qxS+NviGfC8fw78CpDZ69ft4x8VaGNL8JeMtS+yeFNZ+ev+CTa/F3 + 9oTwp4u/4KLftC+GZfBPxD/akm12z+FHhSLxf8bP7Q0L9lDSfiF4r8QfA/w78Q/B3iLX/D/wQ1nUPDlp + reqH4S+Pfh38DvB15rvww1z/AIWZqHifxD4t+O3xMuLv8kx+JxufcI4fM82zLH43FZTneZ4V4vMKlfG1 + 8RHM8Hks8uy+hisXXU50MO8uznFYinRnW+oSr0pzw8f7SjUf1tCnRwGb1MLhMNQo0sXgsNV9jh4woU6b + w1bGxxOInSo07KpU+sYOlTlOMPbqEoqp/s3KfFX7GnxQ+P8A8MdJ/b/PwE1/9jnw/rnj3/guv+2p8OI1 + /bC+KPjX4YaT4p8WeJbb4af8IN4F+F0ngzw54hvPFvxD8S3llqosvCqxpqWoW1i7aRaX8sdytv5f+zR+ + wt4+8I/tP+Lvjh+yh8Df+CKQ/aT+CXjPxjF43h+En7Z37bniT/hTPi/4gWvjrwX4l8NeIPg3ouiat4C+ + Gf2m2m8e+GtJ8EXngTQtL8Nf2VqWmeGNE0iTwzDFpn50ftE/to/CL/gnn+2d+1F8CP2i/wBiDwZ+1d49 + +Hf/AAUw8e/8FDfgd8V9J+Pvif4U6p8L9c+Oeg/Cn4n+BdCsn034T6jrOpf2bo2meCdS+IHhrUtYvPh7 + 4k8XaVYWmp+HfFFr4J8NeI7o+Bv/AAcM/s6fs3fEL4+fFX4Lf8Eu/wDhDPHv7T/jNPiD8cteP7bPjvxH + /wAJx4vj1zxn4kTV/wCy/FnwW13RfDONa+IPi+8+weD9O8P6YRqwtjZG00/S4LL9Tr8HcUYmhmOYZHk+ + ZYj+38vwc41KWb4bL8vzPC1qWFgsPjqdLivL8RUwby6eIfs8Rlqn9Zn9XnRdCc67+Vp5xlVOeGoY7GYa + n/Z+Iqx5ZYSriMRhqkJVJOpQlLKsRTjWWJjBc1PEuPsl7SM+dRgv0w/4LD/tXeEfjp+0/afsBeKb06b+ + yR+yh4M0b9tn/go9r2meJtS8MeJvGfhHwJZ2niPwL+yrpOmaz48+C2jeJj8XtZ8Z/BXw14ePh3xl4t1K + 9+Lvxo+Ems+H4/DOv/BjxJBqv9O/hvw54e8HeHtB8I+EdB0Xwr4T8K6Lpfhvwx4Y8N6XY6H4e8OeHtDs + YNM0XQdB0XTILXTdH0XR9NtbbT9L0vT7a3sdPsbeC0tIIbeGONf4Pv2gP+CxXh7/AIKdeFvHH7FXwv8A + 2D/hl+z78aP+CgPxN/Zh+FXiH9oO4+MFjq19qviHwz8Y/h5H8NLz4q3Hh79nTQfFfjXRfDsFiPC2nXF7 + rGp33g/w9ql7NoGnXyWw0LUP726+A48ybH5BknCWWY7Lq2TVaSzNVMvnjcLjoYqrHD5NUxOdyqYOtXoR + rY7H4jHYSnSdT2lHL8uwNOUI/FU+hyHGUMfjc2xVDEQxsJvDOOIVCrQdKLqYyNPBKNaFOo4UMPToVZT5 + eWpiMRXkm9o//9k= + + 172, 17 diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index b09a799..aa2564f 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -700,7 +700,7 @@ Public Class usrcntlAktDetails gridVermerke.Columns.Clear() lblInfoAviso.Visible = False infotxt = "" - + ' MsgBox("SO") ' If setAkive_AuswahlID() = -1 Then Exit Sub If AvisoID <= 0 Then Exit Sub @@ -916,6 +916,20 @@ Public Class usrcntlAktDetails init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() + Case "74" + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") + myVermerk.VermerkCodeId = 75 + Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) + VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) + init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() + Case "76" + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") + myVermerk.VermerkCodeId = 77 + Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) + VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) + init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() + + End Select loaded = False ' Dim tmpIndex = -1 @@ -1023,16 +1037,28 @@ Public Class usrcntlAktDetails optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Ü-Dok erhalten' einzutragen." End If Case 55 - If Not existCodeInGridVermerke(56, CStr(r.Cells("Hinweis_Vermerk").Value)) Then - optionCell.Value = "Rg-Best. erhalten" - optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Rg-Best. erhalten' einzutragen." - End If - Case 57 - If Not existCodeInGridVermerke(58, CStr(r.Cells("Hinweis_Vermerk").Value)) Then - optionCell.Value = "Dispoliste erhalten" - optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Dispoliste erhalten' einzutragen." - End If - End Select + If Not existCodeInGridVermerke(56, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + optionCell.Value = "Rg-Best. erhalten" + optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Rg-Best. erhalten' einzutragen." + End If + Case 57 + If Not existCodeInGridVermerke(58, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + optionCell.Value = "Dispoliste erhalten" + optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Dispoliste erhalten' einzutragen." + End If + + Case 74 + If Not existCodeInGridVermerke(75, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + optionCell.Value = "Frachtkosten erhalten" + optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Frachtkosten erhalten' einzutragen." + End If + + Case 76 + If Not existCodeInGridVermerke(77, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + optionCell.Value = "Absend.best. erhalten" + optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Absenderbestätigung erhalten' einzutragen." + End If + End Select End If Next @@ -1118,14 +1144,18 @@ Public Class usrcntlAktDetails 'gridMyAviso.ClearSelection() 'WARUM? DirectCast(sender, DataGridView).Rows(e.RowIndex).Selected = True - If e.Button = Windows.Forms.MouseButtons.Right Then + If e.Button = MouseButtons.Right Then If AVISO.Abgeschlossen Then Exit Sub If sender Is gridVermerke Then If gridVermerke.SelectedRows.Count = 0 Then Exit Sub 'Es wurde außerhalb einer gültigen Datenzeile geklickt ' AvisoID = CInt(gridVermerke.Rows(e.RowIndex).Cells("AvisoId").Value) gridVermerke.CurrentCell = gridVermerke.Rows(e.RowIndex).Cells(e.ColumnIndex) - conMenuVermerke.Show(Windows.Forms.Cursor.Position) + conMenuVermerke.Show(Cursor.Position) + + ToolUeberweisungsBeleg.Visible = (gridVermerke.SelectedRows(0).Cells("VermerkeCode").Value = "13") + toolVkReminder.Visible = (gridVermerke.SelectedRows(0).Cells("VermerkeCode").Value = "13") + End If End If @@ -1279,7 +1309,7 @@ Public Class usrcntlAktDetails Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm() Dim sv As New frmAddSendungsvermerkShort(AvisoID, -1) ', dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value) - sv.Location = Me.PointToClient(System.Windows.Forms.Cursor.Position) + sv.Location = Me.PointToClient(Cursor.Position) sv.ShowDialog(frmGrayOut) frmGrayOut.Close() @@ -1690,7 +1720,7 @@ Public Class usrcntlAktDetails End Sub Private Sub dgvSendungen_CellMouseClick(sender As Object, e As DataGridViewCellMouseEventArgs) Handles dgvSendungen.CellMouseClick - If e.Button = Windows.Forms.MouseButtons.Right Then + If e.Button = MouseButtons.Right Then If dgvSendungen.Columns.Count > 0 Then If dgvSendungen.Columns(e.ColumnIndex).Name = "SenungUebernehmen" Then Exit Sub @@ -1724,7 +1754,7 @@ Public Class usrcntlAktDetails ' Next ' C.Items.Add(item_Firma) 'Next - 'C.Show(System.Windows.Forms.Cursor.Position) + 'C.Show(System.Cursor.Position) Else If AVISO.Abgeschlossen Then Exit Sub @@ -1743,7 +1773,7 @@ Public Class usrcntlAktDetails Dim frmGrayOut = grayoutForm() Dim sv As New frmAddSendungsvermerkShort(AvisoID, dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value) - sv.Location = Me.PointToClient(System.Windows.Forms.Cursor.Position) + sv.Location = Me.PointToClient(Cursor.Position) sv.ShowDialog(frmGrayOut) frmGrayOut.Close() If tbcntlVermerke.SelectedIndex <> 2 Then tbcntlVermerke.SelectedIndex = 2 @@ -1843,7 +1873,7 @@ Public Class usrcntlAktDetails Private Sub btnKassenbuchEintrag_Click(sender As Object, e As EventArgs) Dim PERSONAL As SDL.cPersonal = Nothing Dim frmSecureLoginKassenbuch As New SDL.frmSecureLoginKassenbuch - If frmSecureLoginKassenbuch.ShowDialog(Me) = Windows.Forms.DialogResult.OK Then + If frmSecureLoginKassenbuch.ShowDialog(Me) = DialogResult.OK Then PERSONAL = frmSecureLoginKassenbuch.PERSONAL Dim frmBeleg As New SDL.frmBelegNeu(PERSONAL, Nothing, "E") @@ -2052,7 +2082,7 @@ Public Class usrcntlAktDetails Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm() Dim sv As New frmAddSendungsvermerkShort(AvisoID, -1) ', dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value) - sv.Location = Me.PointToClient(System.Windows.Forms.Cursor.Position) + sv.Location = Me.PointToClient(Cursor.Position) sv.ShowDialog(frmGrayOut) frmGrayOut.Close() @@ -2245,10 +2275,10 @@ Public Class usrcntlAktDetails Exit Sub ' pnlFormulare.Visible = Not pnlFormulare.Visible - cntxtFormulare.Show(Windows.Forms.Cursor.Position) + cntxtFormulare.Show(Cursor.Position) ' Dim ScreenPos As Point = Me.PointToScreen(New Point(0, 0)) - 'pnlFormulare.PointToClient = Windows.Forms.Cursor.Position + 'pnlFormulare.PointToClient = Cursor.Position End Sub @@ -2266,7 +2296,7 @@ Public Class usrcntlAktDetails Dim PERSONAL As SDL.cPersonal = Nothing Dim frmSecureLoginKassenbuch As New SDL.frmSecureLoginKassenbuch - If frmSecureLoginKassenbuch.ShowDialog(Me) = Windows.Forms.DialogResult.OK Then + If frmSecureLoginKassenbuch.ShowDialog(Me) = DialogResult.OK Then PERSONAL = frmSecureLoginKassenbuch.PERSONAL Dim frmBeleg As New SDL.frmBelegNeu(PERSONAL, Nothing, "E") frmBeleg.AvisoID = AvisoID @@ -2282,6 +2312,9 @@ Public Class usrcntlAktDetails ' frmBeleg.BELEG.AbfertigungsNr = Me.SENDUNG_LIST(Me.CURRENT_INDEX).AbfertigungsNr frmBeleg.BELEG.LKW_Id = AVISO.AvisoID frmBeleg.BELEG.LKW_Beleg = True + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then + frmBeleg.BELEG.LKW_Beleg = False + End If frmBeleg.init() If AVISO.Frächter_KdNr > 0 Then @@ -2293,7 +2326,7 @@ Public Class usrcntlAktDetails End Sub - If frmBeleg.ShowDialog(Me) = Windows.Forms.DialogResult.OK Then + If frmBeleg.ShowDialog(Me) = DialogResult.OK Then If frmBeleg.BELEG.gebucht Then 'initDataBinding() End If @@ -2453,7 +2486,6 @@ Public Class usrcntlAktDetails If (dgvSendungen.SelectedRows.Count > 0) Then index = dgvSendungen.SelectedRows(0).Index VermerkeDAL.toggleHervorheben(CInt(gridVermerke.SelectedRows(0).Cells("VermerkID").Value)) Vermerke_anzeigen(index) - End Sub Private Sub Button12_Click(sender As Object, e As EventArgs) Handles Button12.Click @@ -2689,5 +2721,27 @@ Public Class usrcntlAktDetails AvisoStatusFunctions.SendFreigabeEmail(AVISO, mailTo) End If End Sub + + + + Private Sub ToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles ToolUeberweisungsBeleg.Click, toolVkReminder.Click + If gridVermerke.SelectedRows.Count = 0 Then Exit Sub + Dim index As Integer = -1 + If (dgvSendungen.SelectedRows.Count > 0) Then index = dgvSendungen.SelectedRows(0).Index + + + Dim AvisoId_Tmp = gridVermerke.SelectedRows(0).Cells("AvisoId").Value + Dim SendungID_Tmp = gridVermerke.SelectedRows(0).Cells("SendungID").Value + + If sender Is toolVkReminder Then + AvisoStatusFunctions.insertSendungsVermerk(SendungID_Tmp, AvisoId_Tmp, "VK: Reminder geschickt", 78) + ElseIf sender Is ToolUeberweisungsBeleg Then + AvisoStatusFunctions.insertSendungsVermerk(SendungID_Tmp, AvisoId_Tmp, "VK: Überweisungsbeleg erhalten.", 79) + End If + + Vermerke_anzeigen(index) + + End Sub + End Class diff --git a/Aviso/usrcntlAktDetailsATILLA.vb b/Aviso/usrcntlAktDetailsATILLA.vb index 984d70f..36add7c 100644 --- a/Aviso/usrcntlAktDetailsATILLA.vb +++ b/Aviso/usrcntlAktDetailsATILLA.vb @@ -592,13 +592,13 @@ Public Class usrcntlAktDetailsATILLA 'gridMyAviso.ClearSelection() 'WARUM? DirectCast(sender, DataGridView).Rows(e.RowIndex).Selected = True - If e.Button = Windows.Forms.MouseButtons.Right Then + If e.Button = MouseButtons.Right Then If AVISO.Abgeschlossen Then Exit Sub If sender Is gridVermerke Then If gridVermerke.SelectedRows.Count = 0 Then Exit Sub 'Es wurde außerhalb einer gültigen Datenzeile geklickt ' AvisoID = CInt(gridVermerke.Rows(e.RowIndex).Cells("AvisoId").Value) gridVermerke.CurrentCell = gridVermerke.Rows(e.RowIndex).Cells(e.ColumnIndex) - conMenuVermerke.Show(Windows.Forms.Cursor.Position) + conMenuVermerke.Show(Cursor.Position) End If End If @@ -648,7 +648,7 @@ Public Class usrcntlAktDetailsATILLA Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm() Dim sv As New frmAddSendungsvermerkShort(AvisoID, -1) ', dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value) - sv.Location = Me.PointToClient(System.Windows.Forms.Cursor.Position) + sv.Location = Me.PointToClient(Cursor.Position) sv.ShowDialog(frmGrayOut) frmGrayOut.Close() @@ -662,50 +662,50 @@ Public Class usrcntlAktDetailsATILLA Private Sub btnAnkunft_Click(sender As Object, e As EventArgs) Handles btnAnkunft.Click If FUNC.setAnkunft(AvisoID) Then - frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) - frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) + frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) End If End Sub Private Sub btnErfasst_Click(sender As Object, e As EventArgs) Handles btnErfasst.Click If FUNC.setErfasst(AvisoID) Then - frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) - frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) + frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) End If End Sub Private Sub btnVorbereitet_Click(sender As Object, e As EventArgs) If FUNC.setVorbereitet(AvisoID) Then - frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) - frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) + frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) End If End Sub Private Sub btnVorgeschrieben_Click(sender As Object, e As EventArgs) Handles btnVorgeschrieben.Click If FUNC.setVorgeschreiben(AvisoID) Then - frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) - frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) + frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) End If End Sub Private Sub btnFreigabe_Click(sender As Object, e As EventArgs) Handles btnFreigabe.Click If FUNC.setFreigabe(AvisoID, Me) Then - frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) - frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) + frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) End If End Sub Private Sub btnNichtEingetroffen_Click(sender As Object, e As EventArgs) Handles btnNichtEingetroffen.Click If FUNC.setNichtEingeftroffen(AvisoID) Then - frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) - frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) + frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) End If End Sub Private Sub btnÜbernehmen_Click(sender As Object, e As EventArgs) If FUNC.AktUebernehmen(AvisoID) Then - frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) - frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) + frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) End If End Sub @@ -717,7 +717,7 @@ Public Class usrcntlAktDetailsATILLA End Sub Private Sub Button2_Click(sender As Object, e As EventArgs) - VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID = AvisoID 'zur Sicherheit + VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = AvisoID 'zur Sicherheit Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm() Dim f As New frmEintragAviso f.ShowDialog(frmGrayOut) @@ -816,10 +816,10 @@ Public Class usrcntlAktDetailsATILLA Private Sub Button1_Click_1(sender As Object, e As EventArgs) ' pnlFormulare.Visible = Not pnlFormulare.Visible - cntxtFormulare.Show(Windows.Forms.Cursor.Position) + cntxtFormulare.Show(Cursor.Position) ' Dim ScreenPos As Point = Me.PointToScreen(New Point(0, 0)) - 'pnlFormulare.PointToClient = Windows.Forms.Cursor.Position + 'pnlFormulare.PointToClient = Cursor.Position End Sub @@ -837,7 +837,7 @@ Public Class usrcntlAktDetailsATILLA Private Sub btnKassenbuchEintrag_Click(sender As Object, e As EventArgs) Handles btnKassenbuchEintrag.Click Dim PERSONAL As SDL.cPersonal = Nothing Dim frmSecureLoginKassenbuch As New SDL.frmSecureLoginKassenbuch - If frmSecureLoginKassenbuch.ShowDialog(Me) = Windows.Forms.DialogResult.OK Then + If frmSecureLoginKassenbuch.ShowDialog(Me) = DialogResult.OK Then PERSONAL = frmSecureLoginKassenbuch.PERSONAL Dim frmBeleg As New SDL.frmBelegNeu(PERSONAL, Nothing, "E") @@ -884,8 +884,8 @@ Public Class usrcntlAktDetailsATILLA If AvisoID < 0 Then MsgBox("Fehler: AvisoID kleiner 0.") : Exit Sub Dim frmNacherfassung As New SDL.frmNacherfassungNEU - If posNr.Filiale <= 0 And VERAG_PROG_ALLGEMEIN.cglobal.AktiverMitarbeiter.StandartFiliale > 0 Then 'Aus den Mitarbeiter-Stammdaten - posNr.Filiale = VERAG_PROG_ALLGEMEIN.cglobal.AktiverMitarbeiter.StandartFiliale + If posNr.Filiale <= 0 And VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.StandartFiliale > 0 Then 'Aus den Mitarbeiter-Stammdaten + posNr.Filiale = VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.StandartFiliale End If If SENDUNG_LIST IsNot Nothing AndAlso SENDUNG_LIST.Count > 0 Then ' @@ -943,8 +943,8 @@ Public Class usrcntlAktDetailsATILLA Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click If FUNC.AktUebernehmen(AvisoID) Then - frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) - frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) + frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) End If End Sub @@ -993,12 +993,12 @@ Public Class usrcntlAktDetailsATILLA Dim PERSONAL As SDL.cPersonal = Nothing Dim frmSecureLoginKassenbuch As New SDL.frmSecureLoginKassenbuch ' frmSecureLoginKassenbuch.KassenbuchNr_tmp = PERSONAL.KassenbuchNr - If frmSecureLoginKassenbuch.ShowDialog(Me) = Windows.Forms.DialogResult.OK Then + If frmSecureLoginKassenbuch.ShowDialog(Me) = DialogResult.OK Then PERSONAL = frmSecureLoginKassenbuch.PERSONAL Dim frmNacherfassungLeihgeld As New SDL.frmNacherfassungLeihgeld(PERSONAL, frmSecureLoginKassenbuch.PERSONAL_LG) - frmNacherfassungLeihgeld.FMZollPersID = VERAG_PROG_ALLGEMEIN.cglobal.AktiverMitarbeiter.mit_FMZollPersID + frmNacherfassungLeihgeld.FMZollPersID = VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.mit_FMZollPersID 'frmNacherfassungLeihgeld.ShowDialog() frmNacherfassungLeihgeld.AvisoID = AvisoID diff --git a/Aviso/usrcntlAktDetailsATILLANeu.vb b/Aviso/usrcntlAktDetailsATILLANeu.vb index 340d9fe..656a067 100644 --- a/Aviso/usrcntlAktDetailsATILLANeu.vb +++ b/Aviso/usrcntlAktDetailsATILLANeu.vb @@ -737,13 +737,13 @@ Public Class usrcntlAktDetailsATILLANeu 'gridMyAviso.ClearSelection() 'WARUM? DirectCast(sender, DataGridView).Rows(e.RowIndex).Selected = True - If e.Button = Windows.Forms.MouseButtons.Right Then + If e.Button = MouseButtons.Right Then If AVISO.Abgeschlossen Then Exit Sub If sender Is gridVermerke Then If gridVermerke.SelectedRows.Count = 0 Then Exit Sub 'Es wurde außerhalb einer gültigen Datenzeile geklickt ' AvisoID = CInt(gridVermerke.Rows(e.RowIndex).Cells("AvisoId").Value) gridVermerke.CurrentCell = gridVermerke.Rows(e.RowIndex).Cells(e.ColumnIndex) - conMenuVermerke.Show(Windows.Forms.Cursor.Position) + conMenuVermerke.Show(Cursor.Position) End If End If @@ -793,7 +793,7 @@ Public Class usrcntlAktDetailsATILLANeu Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm() Dim sv As New frmAddSendungsvermerkShort(AvisoID, -1) ', dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value) - sv.Location = Me.PointToClient(System.Windows.Forms.Cursor.Position) + sv.Location = Me.PointToClient(Cursor.Position) sv.ShowDialog(frmGrayOut) frmGrayOut.Close() @@ -811,50 +811,50 @@ Public Class usrcntlAktDetailsATILLANeu Private Sub btnAnkunft_Click(sender As Object, e As EventArgs) Handles btnAnkunft.Click If FUNC.setAnkunft(AvisoID) Then - frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) - frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) + frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) End If End Sub Private Sub btnErfasst_Click(sender As Object, e As EventArgs) Handles btnErfasst.Click If FUNC.setErfasst(AvisoID) Then - frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) - frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) + frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) End If End Sub Private Sub btnVorbereitet_Click(sender As Object, e As EventArgs) If FUNC.setVorbereitet(AvisoID) Then - frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) - frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) + frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) End If End Sub Private Sub btnVorgeschrieben_Click(sender As Object, e As EventArgs) Handles btnVorgeschrieben.Click If FUNC.setVorgeschreiben(AvisoID) Then - frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) - frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) + frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) End If End Sub Private Sub btnFreigabe_Click(sender As Object, e As EventArgs) Handles btnFreigabe.Click If FUNC.setFreigabe(AvisoID, Me) Then - frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) - frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) + frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) End If End Sub Private Sub btnNichtEingetroffen_Click(sender As Object, e As EventArgs) Handles btnNichtEingetroffen.Click If FUNC.setNichtEingeftroffen(AvisoID) Then - frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) - frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) + frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) End If End Sub Private Sub btnÜbernehmen_Click(sender As Object, e As EventArgs) If FUNC.AktUebernehmen(AvisoID) Then - frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) - frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) + frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) End If End Sub @@ -950,10 +950,10 @@ Public Class usrcntlAktDetailsATILLANeu Private Sub Button1_Click_1(sender As Object, e As EventArgs) ' pnlFormulare.Visible = Not pnlFormulare.Visible - cntxtFormulare.Show(Windows.Forms.Cursor.Position) + cntxtFormulare.Show(Cursor.Position) ' Dim ScreenPos As Point = Me.PointToScreen(New Point(0, 0)) - 'pnlFormulare.PointToClient = Windows.Forms.Cursor.Position + 'pnlFormulare.PointToClient = Cursor.Position End Sub @@ -971,7 +971,7 @@ Public Class usrcntlAktDetailsATILLANeu Private Sub btnKassenbuchEintrag_Click(sender As Object, e As EventArgs) Handles btnKassenbuchEintrag.Click Dim PERSONAL As SDL.cPersonal = Nothing Dim frmSecureLoginKassenbuch As New SDL.frmSecureLoginKassenbuch - If frmSecureLoginKassenbuch.ShowDialog(Me) = Windows.Forms.DialogResult.OK Then + If frmSecureLoginKassenbuch.ShowDialog(Me) = DialogResult.OK Then PERSONAL = frmSecureLoginKassenbuch.PERSONAL Dim frmBeleg As New SDL.frmBelegNeu(PERSONAL, Nothing, "E") @@ -1021,8 +1021,8 @@ Public Class usrcntlAktDetailsATILLANeu If AvisoID < 0 Then MsgBox("Fehler: AvisoID kleiner 0.") : Exit Sub Dim frmNacherfassung As New SDL.frmNacherfassungNEU - If posNr.Filiale <= 0 And VERAG_PROG_ALLGEMEIN.cglobal.AktiverMitarbeiter.StandartFiliale > 0 Then 'Aus den Mitarbeiter-Stammdaten - posNr.Filiale = VERAG_PROG_ALLGEMEIN.cglobal.AktiverMitarbeiter.StandartFiliale + If posNr.Filiale <= 0 And VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.StandartFiliale > 0 Then 'Aus den Mitarbeiter-Stammdaten + posNr.Filiale = VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.StandartFiliale End If @@ -1081,8 +1081,8 @@ Public Class usrcntlAktDetailsATILLANeu Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click If FUNC.AktUebernehmen(AvisoID) Then - frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) - frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID) + frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) End If End Sub @@ -1131,12 +1131,12 @@ Public Class usrcntlAktDetailsATILLANeu Dim PERSONAL As SDL.cPersonal = Nothing Dim frmSecureLoginKassenbuch As New SDL.frmSecureLoginKassenbuch ' frmSecureLoginKassenbuch.KassenbuchNr_tmp = PERSONAL.KassenbuchNr - If frmSecureLoginKassenbuch.ShowDialog(Me) = Windows.Forms.DialogResult.OK Then + If frmSecureLoginKassenbuch.ShowDialog(Me) = DialogResult.OK Then PERSONAL = frmSecureLoginKassenbuch.PERSONAL Dim frmNacherfassungLeihgeld As New SDL.frmNacherfassungLeihgeld(PERSONAL, frmSecureLoginKassenbuch.PERSONAL_LG) - frmNacherfassungLeihgeld.FMZollPersID = VERAG_PROG_ALLGEMEIN.cglobal.AktiverMitarbeiter.mit_FMZollPersID + frmNacherfassungLeihgeld.FMZollPersID = VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.mit_FMZollPersID 'frmNacherfassungLeihgeld.ShowDialog() frmNacherfassungLeihgeld.AvisoID = AvisoID @@ -1184,7 +1184,7 @@ Public Class usrcntlAktDetailsATILLANeu End Sub Private Sub btnÄndern_Click(sender As Object, e As EventArgs) Handles btnÄndern.Click - VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID = AvisoID 'zur Sicherheit + VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = AvisoID 'zur Sicherheit Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm() Dim f As New frmEintragAviso f.ShowDialog(frmGrayOut) @@ -1210,7 +1210,7 @@ Public Class usrcntlAktDetailsATILLANeu End If pnlOptionen.Visible = False AvisoDAL.LöschenAviso(AvisoID) - VERAG_PROG_ALLGEMEIN.cglobal.Aktive_ID = -1 + VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = -1 'frmHauptfenster.avisoAktualisierenAktiveIdBehalten(-1) frmHauptfenster.pnlDetailsRechts.Visible = False End If @@ -1224,7 +1224,7 @@ Public Class usrcntlAktDetailsATILLANeu End Sub Private Sub Button6_Click(sender As Object, e As EventArgs) Handles Button6.Click - cntxtZollantrag.Show(Windows.Forms.Cursor.Position) + cntxtZollantrag.Show(Cursor.Position) End Sub Sub genZollantrag(ncts_Art)