diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index 7b2501b..33ad854 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -769,6 +769,12 @@ UserControl + + usrCntlSND_ATBGestellung.vb + + + UserControl + usrCntlSND_NCTSGestellungsadresse.vb @@ -1020,6 +1026,9 @@ usrCntlSND_NCTSFiskalEndempf.vb + + usrCntlSND_ATBGestellung.vb + usrCntlSND_NCTSGestellungsadresse.vb diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 3cf86fd..754d048 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 4197d5a..4c476cc 100644 --- a/Aviso/My Project/Resources.Designer.vb +++ b/Aviso/My Project/Resources.Designer.vb @@ -1429,7 +1429,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 3.5.5.5 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die 3.5.6.4 ähnelt. ''' Friend ReadOnly Property Version() As String Get diff --git a/Aviso/My Project/Resources.resx b/Aviso/My Project/Resources.resx index 4bb6e85..c13596f 100644 --- a/Aviso/My Project/Resources.resx +++ b/Aviso/My Project/Resources.resx @@ -536,7 +536,7 @@ ..\Resources\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - 3.5.5.5 + 3.5.6.4 ..\Resources\statusBtn_vorgeschrieben_Aktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/Aviso/frmAddAktenvermerkShort.Designer.vb b/Aviso/frmAddAktenvermerkShort.Designer.vb index c5bf3f2..b9a84b9 100644 --- a/Aviso/frmAddAktenvermerkShort.Designer.vb +++ b/Aviso/frmAddAktenvermerkShort.Designer.vb @@ -24,6 +24,14 @@ Partial Class frmAddAktenvermerkShort Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAddAktenvermerkShort)) Me.pnlAktenVermerk = New System.Windows.Forms.Panel() + Me.btnDEZollDIGITAL = New System.Windows.Forms.Button() + Me.Panel1 = New System.Windows.Forms.Panel() + Me.Label24 = New System.Windows.Forms.Label() + Me.btnSBG = New System.Windows.Forms.Button() + Me.btnWAI = New System.Windows.Forms.Button() + Me.btnNKD = New System.Windows.Forms.Button() + Me.btnSFD = New System.Windows.Forms.Button() + Me.btnQS = New System.Windows.Forms.Button() Me.txtFreigabeInfo = New System.Windows.Forms.TextBox() Me.Label4 = New System.Windows.Forms.Label() Me.btnDispoangefordert = New System.Windows.Forms.Button() @@ -45,21 +53,16 @@ Partial Class frmAddAktenvermerkShort Me.btnVorgeschrieben = New System.Windows.Forms.Button() Me.btnSpaetAvisiert = New System.Windows.Forms.Button() Me.btnNichtAvisiert = New System.Windows.Forms.Button() - Me.btnQS = New System.Windows.Forms.Button() - Me.btnSFD = New System.Windows.Forms.Button() - Me.btnNKD = New System.Windows.Forms.Button() - Me.btnWAI = New System.Windows.Forms.Button() - Me.btnSBG = New System.Windows.Forms.Button() Me.btnLKWStandzeitFeierteage = New System.Windows.Forms.Button() Me.btnLKWStandzeitWE = New System.Windows.Forms.Button() Me.btnZollDEEingereicht = New System.Windows.Forms.Button() Me.btnZollATEingereicht = New System.Windows.Forms.Button() Me.optKeineAuswahl = New System.Windows.Forms.RadioButton() Me.Label15 = New System.Windows.Forms.Label() - Me.Label24 = New System.Windows.Forms.Label() Me.Label16 = New System.Windows.Forms.Label() Me.Label14 = New System.Windows.Forms.Label() Me.pnlAktenVermerk.SuspendLayout() + Me.Panel1.SuspendLayout() Me.pnl.SuspendLayout() Me.SuspendLayout() ' @@ -67,8 +70,11 @@ Partial Class frmAddAktenvermerkShort ' Me.pnlAktenVermerk.BackColor = System.Drawing.Color.White Me.pnlAktenVermerk.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnlAktenVermerk.Controls.Add(Me.btnDEZollDIGITAL) + Me.pnlAktenVermerk.Controls.Add(Me.Panel1) Me.pnlAktenVermerk.Controls.Add(Me.txtFreigabeInfo) Me.pnlAktenVermerk.Controls.Add(Me.Label4) + Me.pnlAktenVermerk.Controls.Add(Me.btnSFD) Me.pnlAktenVermerk.Controls.Add(Me.btnDispoangefordert) Me.pnlAktenVermerk.Controls.Add(Me.Button3) Me.pnlAktenVermerk.Controls.Add(Me.Label3) @@ -80,31 +86,129 @@ Partial Class frmAddAktenvermerkShort Me.pnlAktenVermerk.Controls.Add(Me.Button1) Me.pnlAktenVermerk.Controls.Add(Me.pnl) Me.pnlAktenVermerk.Controls.Add(Me.btnSpaetAvisiert) - Me.pnlAktenVermerk.Controls.Add(Me.btnNichtAvisiert) - Me.pnlAktenVermerk.Controls.Add(Me.btnQS) - Me.pnlAktenVermerk.Controls.Add(Me.btnSFD) - Me.pnlAktenVermerk.Controls.Add(Me.btnNKD) - Me.pnlAktenVermerk.Controls.Add(Me.btnWAI) - Me.pnlAktenVermerk.Controls.Add(Me.btnSBG) Me.pnlAktenVermerk.Controls.Add(Me.btnLKWStandzeitFeierteage) Me.pnlAktenVermerk.Controls.Add(Me.btnLKWStandzeitWE) Me.pnlAktenVermerk.Controls.Add(Me.btnZollDEEingereicht) Me.pnlAktenVermerk.Controls.Add(Me.btnZollATEingereicht) Me.pnlAktenVermerk.Controls.Add(Me.optKeineAuswahl) Me.pnlAktenVermerk.Controls.Add(Me.Label15) - Me.pnlAktenVermerk.Controls.Add(Me.Label24) Me.pnlAktenVermerk.Controls.Add(Me.Label16) - Me.pnlAktenVermerk.Controls.Add(Me.Label14) Me.pnlAktenVermerk.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlAktenVermerk.Location = New System.Drawing.Point(0, 0) Me.pnlAktenVermerk.Name = "pnlAktenVermerk" - Me.pnlAktenVermerk.Size = New System.Drawing.Size(414, 534) + Me.pnlAktenVermerk.Size = New System.Drawing.Size(401, 482) Me.pnlAktenVermerk.TabIndex = 0 ' + 'btnDEZollDIGITAL + ' + Me.btnDEZollDIGITAL.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnDEZollDIGITAL.Image = Global.AVISO.My.Resources.Resources.digitalerAkt_small + Me.btnDEZollDIGITAL.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnDEZollDIGITAL.Location = New System.Drawing.Point(205, 145) + Me.btnDEZollDIGITAL.Margin = New System.Windows.Forms.Padding(0) + Me.btnDEZollDIGITAL.Name = "btnDEZollDIGITAL" + Me.btnDEZollDIGITAL.Size = New System.Drawing.Size(89, 83) + Me.btnDEZollDIGITAL.TabIndex = 107 + Me.btnDEZollDIGITAL.Text = "Zoll DE DIGITAL eingereicht" + Me.btnDEZollDIGITAL.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.btnDEZollDIGITAL.UseVisualStyleBackColor = True + ' + 'Panel1 + ' + Me.Panel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Panel1.Controls.Add(Me.Label24) + Me.Panel1.Controls.Add(Me.btnSBG) + Me.Panel1.Controls.Add(Me.btnWAI) + Me.Panel1.Controls.Add(Me.btnNKD) + Me.Panel1.Controls.Add(Me.btnQS) + Me.Panel1.Controls.Add(Me.Label14) + Me.Panel1.Controls.Add(Me.btnNichtAvisiert) + Me.Panel1.Location = New System.Drawing.Point(308, 228) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(70, 25) + Me.Panel1.TabIndex = 106 + Me.Panel1.Visible = False + ' + 'Label24 + ' + Me.Label24.AutoSize = True + Me.Label24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label24.Location = New System.Drawing.Point(3, 0) + Me.Label24.Name = "Label24" + Me.Label24.Size = New System.Drawing.Size(151, 13) + Me.Label24.TabIndex = 8 + Me.Label24.Text = "Akt / Aviso weitergeleitet" + ' + 'btnSBG + ' + Me.btnSBG.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnSBG.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnSBG.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnSBG.Location = New System.Drawing.Point(3, 16) + Me.btnSBG.Name = "btnSBG" + Me.btnSBG.Size = New System.Drawing.Size(182, 27) + Me.btnSBG.TabIndex = 88 + Me.btnSBG.Text = "nach Salzburg" + Me.btnSBG.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnSBG.UseVisualStyleBackColor = True + ' + 'btnWAI + ' + Me.btnWAI.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnWAI.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnWAI.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnWAI.Location = New System.Drawing.Point(3, 74) + Me.btnWAI.Name = "btnWAI" + Me.btnWAI.Size = New System.Drawing.Size(182, 27) + Me.btnWAI.TabIndex = 88 + Me.btnWAI.Text = "nach Waidhaus" + Me.btnWAI.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnWAI.UseVisualStyleBackColor = True + ' + 'btnNKD + ' + Me.btnNKD.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnNKD.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnNKD.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnNKD.Location = New System.Drawing.Point(3, 45) + Me.btnNKD.Name = "btnNKD" + Me.btnNKD.Size = New System.Drawing.Size(182, 27) + Me.btnNKD.TabIndex = 89 + Me.btnNKD.Text = "nach Nickelsdorf" + Me.btnNKD.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnNKD.UseVisualStyleBackColor = True + ' + 'btnSFD + ' + Me.btnSFD.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnSFD.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnSFD.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnSFD.Location = New System.Drawing.Point(11, 256) + Me.btnSFD.Name = "btnSFD" + Me.btnSFD.Size = New System.Drawing.Size(182, 27) + Me.btnSFD.TabIndex = 89 + Me.btnSFD.Text = "nach Spielfeld (Lex)" + Me.btnSFD.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnSFD.UseVisualStyleBackColor = True + ' + 'btnQS + ' + Me.btnQS.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnQS.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnQS.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnQS.Location = New System.Drawing.Point(3, 132) + Me.btnQS.Name = "btnQS" + Me.btnQS.Size = New System.Drawing.Size(182, 27) + Me.btnQS.TabIndex = 89 + Me.btnQS.Text = "in die QS - Abteilung gegeben" & Global.Microsoft.VisualBasic.ChrW(10) + Me.btnQS.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnQS.UseVisualStyleBackColor = True + ' 'txtFreigabeInfo ' + Me.txtFreigabeInfo.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.txtFreigabeInfo.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtFreigabeInfo.Location = New System.Drawing.Point(11, 489) + Me.txtFreigabeInfo.Location = New System.Drawing.Point(11, 437) Me.txtFreigabeInfo.Multiline = True Me.txtFreigabeInfo.Name = "txtFreigabeInfo" Me.txtFreigabeInfo.Size = New System.Drawing.Size(182, 40) @@ -112,9 +216,10 @@ Partial Class frmAddAktenvermerkShort ' 'Label4 ' + Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.Label4.AutoSize = True Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label4.Location = New System.Drawing.Point(11, 473) + Me.Label4.Location = New System.Drawing.Point(11, 421) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(86, 13) Me.Label4.TabIndex = 104 @@ -122,10 +227,11 @@ Partial Class frmAddAktenvermerkShort ' 'btnDispoangefordert ' + Me.btnDispoangefordert.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.btnDispoangefordert.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnDispoangefordert.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnDispoangefordert.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.btnDispoangefordert.Location = New System.Drawing.Point(216, 285) + Me.btnDispoangefordert.Location = New System.Drawing.Point(11, 318) Me.btnDispoangefordert.Name = "btnDispoangefordert" Me.btnDispoangefordert.Size = New System.Drawing.Size(182, 27) Me.btnDispoangefordert.TabIndex = 103 @@ -135,10 +241,11 @@ Partial Class frmAddAktenvermerkShort ' 'Button3 ' + Me.Button3.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button3.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Button3.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.Button3.Location = New System.Drawing.Point(216, 256) + Me.Button3.Location = New System.Drawing.Point(11, 289) Me.Button3.Name = "Button3" Me.Button3.Size = New System.Drawing.Size(182, 27) Me.Button3.TabIndex = 102 @@ -148,9 +255,10 @@ Partial Class frmAddAktenvermerkShort ' 'Label3 ' + Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.Label3.AutoSize = True Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label3.Location = New System.Drawing.Point(11, 404) + Me.Label3.Location = New System.Drawing.Point(11, 352) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(66, 13) Me.Label3.TabIndex = 101 @@ -158,8 +266,9 @@ Partial Class frmAddAktenvermerkShort ' 'txtSonstiges ' + Me.txtSonstiges.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.txtSonstiges.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtSonstiges.Location = New System.Drawing.Point(11, 420) + Me.txtSonstiges.Location = New System.Drawing.Point(11, 368) Me.txtSonstiges.Multiline = True Me.txtSonstiges.Name = "txtSonstiges" Me.txtSonstiges.Size = New System.Drawing.Size(137, 46) @@ -167,10 +276,11 @@ Partial Class frmAddAktenvermerkShort ' 'btnSonstiges ' + Me.btnSonstiges.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.btnSonstiges.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnSonstiges.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnSonstiges.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.btnSonstiges.Location = New System.Drawing.Point(154, 420) + Me.btnSonstiges.Location = New System.Drawing.Point(154, 368) Me.btnSonstiges.Name = "btnSonstiges" Me.btnSonstiges.Size = New System.Drawing.Size(39, 46) Me.btnSonstiges.TabIndex = 99 @@ -228,7 +338,7 @@ Partial Class frmAddAktenvermerkShort 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(358, 0) + Me.Button1.Location = New System.Drawing.Point(346, 0) Me.Button1.Name = "Button1" Me.Button1.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.Button1.Size = New System.Drawing.Size(54, 20) @@ -247,9 +357,9 @@ Partial Class frmAddAktenvermerkShort Me.pnl.Controls.Add(Me.btnErfasst) Me.pnl.Controls.Add(Me.btnVorbereitet) Me.pnl.Controls.Add(Me.btnVorgeschrieben) - Me.pnl.Location = New System.Drawing.Point(216, 343) + Me.pnl.Location = New System.Drawing.Point(212, 256) Me.pnl.Name = "pnl" - Me.pnl.Size = New System.Drawing.Size(197, 190) + Me.pnl.Size = New System.Drawing.Size(197, 225) Me.pnl.TabIndex = 93 ' 'btnNichtEingetroffen @@ -358,7 +468,7 @@ Partial Class frmAddAktenvermerkShort Me.btnSpaetAvisiert.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnSpaetAvisiert.Image = Global.AVISO.My.Resources.Resources.LateAviso_s Me.btnSpaetAvisiert.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.btnSpaetAvisiert.Location = New System.Drawing.Point(309, 33) + Me.btnSpaetAvisiert.Location = New System.Drawing.Point(282, 495) Me.btnSpaetAvisiert.Margin = New System.Windows.Forms.Padding(0) Me.btnSpaetAvisiert.Name = "btnSpaetAvisiert" Me.btnSpaetAvisiert.Size = New System.Drawing.Size(89, 83) @@ -369,10 +479,11 @@ Partial Class frmAddAktenvermerkShort ' 'btnNichtAvisiert ' + Me.btnNichtAvisiert.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.btnNichtAvisiert.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnNichtAvisiert.Image = Global.AVISO.My.Resources.Resources.noAviso_s1 Me.btnNichtAvisiert.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.btnNichtAvisiert.Location = New System.Drawing.Point(216, 33) + Me.btnNichtAvisiert.Location = New System.Drawing.Point(32, 16) Me.btnNichtAvisiert.Margin = New System.Windows.Forms.Padding(0) Me.btnNichtAvisiert.Name = "btnNichtAvisiert" Me.btnNichtAvisiert.Size = New System.Drawing.Size(89, 83) @@ -381,77 +492,12 @@ Partial Class frmAddAktenvermerkShort Me.btnNichtAvisiert.TextAlign = System.Drawing.ContentAlignment.BottomCenter Me.btnNichtAvisiert.UseVisualStyleBackColor = True ' - 'btnQS - ' - Me.btnQS.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnQS.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.btnQS.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.btnQS.Location = New System.Drawing.Point(11, 372) - Me.btnQS.Name = "btnQS" - Me.btnQS.Size = New System.Drawing.Size(182, 27) - Me.btnQS.TabIndex = 89 - Me.btnQS.Text = "in die QS - Abteilung gegeben" & Global.Microsoft.VisualBasic.ChrW(10) - Me.btnQS.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnQS.UseVisualStyleBackColor = True - ' - 'btnSFD - ' - Me.btnSFD.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnSFD.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.btnSFD.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.btnSFD.Location = New System.Drawing.Point(11, 343) - Me.btnSFD.Name = "btnSFD" - Me.btnSFD.Size = New System.Drawing.Size(182, 27) - Me.btnSFD.TabIndex = 89 - Me.btnSFD.Text = "nach Spielfeld (Lex)" - Me.btnSFD.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnSFD.UseVisualStyleBackColor = True - ' - 'btnNKD - ' - Me.btnNKD.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnNKD.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.btnNKD.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.btnNKD.Location = New System.Drawing.Point(11, 285) - Me.btnNKD.Name = "btnNKD" - Me.btnNKD.Size = New System.Drawing.Size(182, 27) - Me.btnNKD.TabIndex = 89 - Me.btnNKD.Text = "nach Nickelsdorf" - Me.btnNKD.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnNKD.UseVisualStyleBackColor = True - ' - 'btnWAI - ' - Me.btnWAI.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnWAI.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.btnWAI.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.btnWAI.Location = New System.Drawing.Point(11, 314) - Me.btnWAI.Name = "btnWAI" - Me.btnWAI.Size = New System.Drawing.Size(182, 27) - Me.btnWAI.TabIndex = 88 - Me.btnWAI.Text = "nach Waidhaus" - Me.btnWAI.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnWAI.UseVisualStyleBackColor = True - ' - 'btnSBG - ' - Me.btnSBG.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnSBG.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.btnSBG.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.btnSBG.Location = New System.Drawing.Point(11, 256) - Me.btnSBG.Name = "btnSBG" - Me.btnSBG.Size = New System.Drawing.Size(182, 27) - Me.btnSBG.TabIndex = 88 - Me.btnSBG.Text = "nach Salzburg" - Me.btnSBG.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnSBG.UseVisualStyleBackColor = True - ' 'btnLKWStandzeitFeierteage ' Me.btnLKWStandzeitFeierteage.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnLKWStandzeitFeierteage.Image = CType(resources.GetObject("btnLKWStandzeitFeierteage.Image"), System.Drawing.Image) + Me.btnLKWStandzeitFeierteage.Image = Global.AVISO.My.Resources.Resources.android_clock_s Me.btnLKWStandzeitFeierteage.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.btnLKWStandzeitFeierteage.Location = New System.Drawing.Point(104, 145) + Me.btnLKWStandzeitFeierteage.Location = New System.Drawing.Point(298, 33) Me.btnLKWStandzeitFeierteage.Margin = New System.Windows.Forms.Padding(0) Me.btnLKWStandzeitFeierteage.Name = "btnLKWStandzeitFeierteage" Me.btnLKWStandzeitFeierteage.Size = New System.Drawing.Size(89, 83) @@ -465,7 +511,7 @@ Partial Class frmAddAktenvermerkShort Me.btnLKWStandzeitWE.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnLKWStandzeitWE.Image = CType(resources.GetObject("btnLKWStandzeitWE.Image"), System.Drawing.Image) Me.btnLKWStandzeitWE.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.btnLKWStandzeitWE.Location = New System.Drawing.Point(11, 145) + Me.btnLKWStandzeitWE.Location = New System.Drawing.Point(205, 33) Me.btnLKWStandzeitWE.Margin = New System.Windows.Forms.Padding(0) Me.btnLKWStandzeitWE.Name = "btnLKWStandzeitWE" Me.btnLKWStandzeitWE.Size = New System.Drawing.Size(89, 83) @@ -479,7 +525,7 @@ Partial Class frmAddAktenvermerkShort Me.btnZollDEEingereicht.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnZollDEEingereicht.Image = CType(resources.GetObject("btnZollDEEingereicht.Image"), System.Drawing.Image) Me.btnZollDEEingereicht.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.btnZollDEEingereicht.Location = New System.Drawing.Point(309, 145) + Me.btnZollDEEingereicht.Location = New System.Drawing.Point(104, 145) Me.btnZollDEEingereicht.Margin = New System.Windows.Forms.Padding(0) Me.btnZollDEEingereicht.Name = "btnZollDEEingereicht" Me.btnZollDEEingereicht.Size = New System.Drawing.Size(89, 83) @@ -493,7 +539,7 @@ Partial Class frmAddAktenvermerkShort Me.btnZollATEingereicht.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnZollATEingereicht.Image = CType(resources.GetObject("btnZollATEingereicht.Image"), System.Drawing.Image) Me.btnZollATEingereicht.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.btnZollATEingereicht.Location = New System.Drawing.Point(216, 145) + Me.btnZollATEingereicht.Location = New System.Drawing.Point(11, 145) Me.btnZollATEingereicht.Margin = New System.Windows.Forms.Padding(0) Me.btnZollATEingereicht.Name = "btnZollATEingereicht" Me.btnZollATEingereicht.Size = New System.Drawing.Size(89, 83) @@ -519,28 +565,18 @@ Partial Class frmAddAktenvermerkShort Me.Label15.AutoSize = True Me.Label15.BackColor = System.Drawing.Color.Transparent Me.Label15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label15.Location = New System.Drawing.Point(213, 129) + Me.Label15.Location = New System.Drawing.Point(8, 129) Me.Label15.Name = "Label15" Me.Label15.Size = New System.Drawing.Size(28, 13) Me.Label15.TabIndex = 3 Me.Label15.Text = "Zoll" ' - 'Label24 - ' - Me.Label24.AutoSize = True - Me.Label24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label24.Location = New System.Drawing.Point(11, 240) - Me.Label24.Name = "Label24" - Me.Label24.Size = New System.Drawing.Size(151, 13) - Me.Label24.TabIndex = 8 - Me.Label24.Text = "Akt / Aviso weitergeleitet" - ' 'Label16 ' Me.Label16.AutoSize = True Me.Label16.BackColor = System.Drawing.Color.Transparent Me.Label16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label16.Location = New System.Drawing.Point(8, 129) + Me.Label16.Location = New System.Drawing.Point(202, 20) Me.Label16.Name = "Label16" Me.Label16.Size = New System.Drawing.Size(60, 13) Me.Label16.TabIndex = 9 @@ -548,10 +584,11 @@ Partial Class frmAddAktenvermerkShort ' 'Label14 ' + Me.Label14.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.Label14.AutoSize = True Me.Label14.BackColor = System.Drawing.Color.Transparent Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label14.Location = New System.Drawing.Point(213, 17) + Me.Label14.Location = New System.Drawing.Point(29, 0) Me.Label14.Name = "Label14" Me.Label14.Size = New System.Drawing.Size(38, 13) Me.Label14.TabIndex = 2 @@ -561,7 +598,7 @@ Partial Class frmAddAktenvermerkShort ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(414, 534) + Me.ClientSize = New System.Drawing.Size(401, 482) Me.Controls.Add(Me.pnlAktenVermerk) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) @@ -571,6 +608,8 @@ Partial Class frmAddAktenvermerkShort Me.Text = "Aktenvermerk" Me.pnlAktenVermerk.ResumeLayout(False) Me.pnlAktenVermerk.PerformLayout() + Me.Panel1.ResumeLayout(False) + Me.Panel1.PerformLayout() Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() Me.ResumeLayout(False) @@ -612,4 +651,6 @@ Partial Class frmAddAktenvermerkShort Friend WithEvents btnDispoangefordert As Button Friend WithEvents txtFreigabeInfo As TextBox Friend WithEvents Label4 As Label + Friend WithEvents btnDEZollDIGITAL As Button + Friend WithEvents Panel1 As Panel End Class diff --git a/Aviso/frmAddAktenvermerkShort.resx b/Aviso/frmAddAktenvermerkShort.resx index 30c616c..2b6908c 100644 --- a/Aviso/frmAddAktenvermerkShort.resx +++ b/Aviso/frmAddAktenvermerkShort.resx @@ -118,38 +118,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - /9j/4AAQSkZJRgABAQEAAAAAAAD/7gAOQWRvYmUAZAAAAAAB/9sAQwABAQEBAQEBAQEBAQEBAQEBAQEB - AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAgICAgICAgICAgIDAwMDAwMDAwMD/9sAQwEBAQEBAQECAQEC - AgIBAgIDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMD/8AAEQgA - KAAoAwERAAIRAQMRAf/EABkAAQEBAQEBAAAAAAAAAAAAAAoJBgcECP/EAC8QAAAGAgEBBwMDBQAAAAAA - AAECAwQFBgcICREAEhMUFRcKITEWQSIyQiMzNRj/xAAUAQEAAAAAAAAAAAAAAAAAAAAA/8QAFBEBAAAA - AAAAAAAAAAAAAAAAAP/aAAwDAQACEQMRAD8Afi6dNmTZw9euEGjNogq6du3Sqbds1bN0zKruHC6piJIo - IpEExzmEClKAiIgAdgM5mDnuy1sRl63618I+nsxyB3ekP04S+bOzssNL07x/LqCqmomnenbqBZXpNEyZ - jJKhMQraTSSOrEqSaPdOYOSptflmuJ1yulnriXG5s4pvaXeuiZp9SxNIB0uo3bLuUi0FSRQjXD5MzYjk - 1iBudQogDkTAI9g6riTnszHrblmn6483unExoJbrxJHgaJtJWJUbvp5fZggpFTTcXNm8sLWipKgoU6yv - rM0jGJKkWlRi0AOoQEzMnrOSZtJGOdtn8e/bIPWL5kuk6ZvWbpIi7Z20coHOi4bOETlOmoQwlOUQEBEB - 7AZ3ntzDl3YvLmnfCDrTc3tFvXINLy0/tDfoQQNNY70zpQvXd8ImQVGveSv7CvTnfQ802JLN6+tCrGFC - XUAQvDqnqngnSnBNE1y1xocVj/F+P4pBhHRrBBAJKbkgboJStut0qkgg4st0srhDzElJOe84drmETCBQ - KUoQJ17ya1nvli75UZRVEzipcZWLa036gUypDM7VrvflmxDfyIBk8oeKYv2HoAj9g7BfzabVnBe5+DL5 - rpsbQojImLMhRK8dLw8mgkL2LeiiqSMtNWlDJqO61ca25VBzGSbUSOmTkhTkN9wEIIcDWW8taw5x3E4N - dk7tI3y3aIyMddtSr/YFgUm8haY3U8c6p7JQQBUgEx40s0H3W5XLskSE6aFQMRrCpEAMbSPDN8vLMX5t - 18RPixifZ/zvTugA3LGHq3pPifu7/wC+zdfD+nTzHX9ewKl7ADG+5on+Kj5TuYNtt4qPZsZavbv051h3 - FewB1W7/ABsnBrVTBkJFWqXm2hXCDZjVJ/F7RhYo9czWQgmz9KSVTMwBBV0DyUF0HSCLpqsk5bOUk127 - hBQiyC6CxAUSWRVTEyaqSqZgMUxREDAPUPp2AtuTvTi/Ll1z/D+oSB+K+ye6/lP8YlC85l9E9T8P6iv4 - ZIT+f07gN+n6dg1PPXiTLWteZtNucLW+lSF9uGgUxLVXamgwBQ9cyDppeRfM7q4SMYrkhEsfs7HOAdcW - rskSnYDTSxSt4dUxQvVqztNgvc/BdD2M1zvkTkPFmQ4lCSiJeNXRF7FvRRSNJ1a0xhVVHVbuNbdKC1k4 - x0BHLJyQxDl+wiHh201H1+3hwZcNdNmMeROSMXXNAguox+B20pBTTUiwRFtqE62EknV7fAqLnOzkGiia - yffOmYToqqpnCe+sFbNwjaEZLi94tzIvJ2s+t9hsBdesg3OENE5Nq+vhGbM+NsI2N16it7nZIjZIXERA - s4tsmZdv5RkyRTQK3Zsw+IeBvFWWNqM9bj85mx9Ik6FZd5JCOx9qHQLE3BCboOmtHPGtavJqEA4JiTIi - FYgwK5I3aElDQS0ygU7SaQOYE3vWTOSZu46RaNn8e/bLsnzF6gk6ZvWbpI6Dlo7bLkOi4bOETmIomcol - OURAQEB7AZbLXA1m7WLLFy2R4O9wZHRS13iSPYL7qdc409005v8AMmBQ6p2NRdMbC2oBVu8ZJBP0aYTj - EljJRRopuUiRQzHuR8uYsb+G/wDPvFgeQ6+V92/yK7gHh9AT9Q9E93So+MI/3P8ARdz9PA/p7Bo8V8Dm - d9p8qUvYrnH3Fkt4rHRZVKyULUegxx6Rp5Q5tMqQpKSVYaMK4jfykKUqThMIaHCSTRKlKKyrY6iJgTXH - x7CJYMoqKZNIyMjGjaPjo6PbIs2EewZokbM2TJm2Im3aNGjdMqaaaZSkTIUClAAAA7B//9k= - - /9j/4AAQSkZJRgABAQEAAAAAAAD/7gAOQWRvYmUAZAAAAAAB/9sAQwABAQEBAQEBAQEBAQEBAQEBAQEB diff --git a/Aviso/frmAddAktenvermerkShort.vb b/Aviso/frmAddAktenvermerkShort.vb index bcc2e43..13a617d 100644 --- a/Aviso/frmAddAktenvermerkShort.vb +++ b/Aviso/frmAddAktenvermerkShort.vb @@ -68,6 +68,8 @@ Public Class frmAddAktenvermerkShort Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim de = SQL.getValueTxtBySql("SELECT COUNT(*) FROM [Vermerke] where avisoid=" & AvisoID & " and VermerkeCode=17", "AVISO") - SQL.getValueTxtBySql("SELECT COUNT(*) FROM [Vermerke] where avisoid=" & AvisoID & " and VermerkeCode=18", "AVISO") + Dim dedigital = SQL.getValueTxtBySql("SELECT COUNT(*) FROM [Vermerke] where avisoid=" & AvisoID & " and VermerkeCode=82", "AVISO") - + SQL.getValueTxtBySql("SELECT COUNT(*) FROM [Vermerke] where avisoid=" & AvisoID & " and VermerkeCode=83", "AVISO") Dim at = SQL.getValueTxtBySql("SELECT COUNT(*) FROM [Vermerke] where avisoid=" & AvisoID & " and VermerkeCode=19", "AVISO") - SQL.getValueTxtBySql("SELECT COUNT(*) FROM [Vermerke] where avisoid=" & AvisoID & " and VermerkeCode=20", "AVISO") @@ -85,6 +87,13 @@ Public Class frmAddAktenvermerkShort btnZollDEEingereicht.FlatAppearance.BorderColor = Color.Black btnZollDEEingereicht.Text = "Zoll DE " & vbNewLine & "fertig" End If + If dedigital > 0 Then + btnDEZollDIGITAL.BackColor = Color.Green + btnDEZollDIGITAL.ForeColor = Color.White + btnDEZollDIGITAL.Tag = "SWITCH" + btnDEZollDIGITAL.FlatAppearance.BorderColor = Color.Black + btnDEZollDIGITAL.Text = "Zoll DE " & vbNewLine & "fertig" + End If btnLKWFertig.Text = If(myAviso.LKW_fertig, "LKW nicht fertig", "LKW fertig") txtFreigabeInfo.Text = If(myAviso.Freigabe_Info, "") @@ -95,8 +104,7 @@ Public Class frmAddAktenvermerkShort Private Sub btn_Click(sender As Object, e As EventArgs) Handles btnSpaetAvisiert.Click, btnLKWStandzeitWE.Click, btnLKWStandzeitFeierteage.Click, btnZollATEingereicht.Click, btnZollDEEingereicht.Click, btnSBG.Click, btnNKD.Click, btnWAI.Click, btnSFD.Click, btnQS.Click, btnErfasst.Click, btnVorbereitet.Click, btnVorgeschrieben.Click, btnAnkunft.Click, - btnFreigabe.Click, btnNichtEingetroffen.Click, btnNichtAvisiert.Click, btnAktUebernehmen.Click, btnLKWFertig.Click, btnSonstiges.Click, btnDispoangefordert.Click - + btnFreigabe.Click, btnNichtEingetroffen.Click, btnNichtAvisiert.Click, btnAktUebernehmen.Click, btnLKWFertig.Click, btnSonstiges.Click, btnDispoangefordert.Click, btnDEZollDIGITAL.Click If sender Is Nothing Then MsgBox("Es wurde kein Vermerk ausgewählt. Der Datensatz kann nicht gespeichert werden.", vbInformation) @@ -119,6 +127,17 @@ btnZollDEEingereicht.Click, btnSBG.Click, btnNKD.Click, btnWAI.Click, btnSFD.Cli Else insertVermerk("DE Zoll eingereicht", 17) End If + ElseIf sender Is btnDEZollDIGITAL Then + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + If sender.tag = "SWITCH" Then + insertVermerk("DE Zoll (DIGITAL) fertig", 83) + If myAviso.LKW_fertig Then VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.LKWFertig(myAviso.AvisoID) : frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + SQL.doSQL("UPDATE AVISO SET ZOLLDigitalEingereicht=0, LKW_fertig=1 where avisoid=" & AvisoID, "AVISO") + Else + insertVermerk("DE Zoll DIGITAL eingereicht", 82) + SQL.doSQL("UPDATE AVISO SET ZOLLDigitalEingereicht=1 where avisoid=" & AvisoID, "AVISO") + End If + frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) ElseIf sender Is btnZollATEingereicht Then If sender.tag = "SWITCH" Then insertVermerk("AT Zoll fertig", 20) diff --git a/Aviso/frmAddSendungsvermerkShort.Designer.vb b/Aviso/frmAddSendungsvermerkShort.Designer.vb index 8987c5f..3ff1dc7 100644 --- a/Aviso/frmAddSendungsvermerkShort.Designer.vb +++ b/Aviso/frmAddSendungsvermerkShort.Designer.vb @@ -72,6 +72,7 @@ Partial Class frmAddSendungsvermerkShort Me.PictureBox4 = New System.Windows.Forms.PictureBox() Me.PictureBox1 = New System.Windows.Forms.PictureBox() Me.Panel4 = New System.Windows.Forms.Panel() + Me.cbxPackliste = New System.Windows.Forms.CheckBox() Me.pnlMain.SuspendLayout() Me.pnlSendungsVermker.SuspendLayout() CType(Me.PictureBox4, System.ComponentModel.ISupportInitialize).BeginInit() @@ -97,6 +98,7 @@ Partial Class frmAddSendungsvermerkShort ' Me.pnlSendungsVermker.BackColor = System.Drawing.Color.White Me.pnlSendungsVermker.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnlSendungsVermker.Controls.Add(Me.cbxPackliste) Me.pnlSendungsVermker.Controls.Add(Me.Label4) Me.pnlSendungsVermker.Controls.Add(Me.optFremd_ATB) Me.pnlSendungsVermker.Controls.Add(Me.optFremd_SendungAvisiert) @@ -636,6 +638,17 @@ Partial Class frmAddSendungsvermerkShort Me.Panel4.Size = New System.Drawing.Size(453, 0) Me.Panel4.TabIndex = 1 ' + 'cbxPackliste + ' + Me.cbxPackliste.AutoSize = True + Me.cbxPackliste.BackColor = System.Drawing.Color.WhiteSmoke + Me.cbxPackliste.Location = New System.Drawing.Point(308, 75) + Me.cbxPackliste.Name = "cbxPackliste" + Me.cbxPackliste.Size = New System.Drawing.Size(69, 17) + Me.cbxPackliste.TabIndex = 97 + Me.cbxPackliste.Text = "Packliste" + Me.cbxPackliste.UseVisualStyleBackColor = False + ' 'frmAddSendungsvermerkShort ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -705,4 +718,5 @@ Partial Class frmAddSendungsvermerkShort Friend WithEvents optFrachtkostenAngefordert As CheckBox Friend WithEvents optKundeNichtErreichbar As CheckBox Friend WithEvents optAbsenderbestätigung As CheckBox + Friend WithEvents cbxPackliste As CheckBox End Class diff --git a/Aviso/frmAddSendungsvermerkShort.vb b/Aviso/frmAddSendungsvermerkShort.vb index e026fee..f179676 100644 --- a/Aviso/frmAddSendungsvermerkShort.vb +++ b/Aviso/frmAddSendungsvermerkShort.vb @@ -147,6 +147,7 @@ Public Class frmAddSendungsvermerkShort 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 bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 11) + If cbxPackliste.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Packliste bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 90) 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) @@ -279,7 +280,7 @@ Public Class frmAddSendungsvermerkShort 'End Sub Private Sub cbxAuftrag_CheckedChanged(sender As Object, e As EventArgs) Handles cbxAuftrag.CheckedChanged, cbxRechnung.CheckedChanged, cbxLS.CheckedChanged, - cbxCMR.CheckedChanged, cbxATR.CheckedChanged, cbxVollmacht.CheckedChanged, cbxSonstDok.CheckedChanged, cbxNichtLeserlich.CheckedChanged + cbxCMR.CheckedChanged, cbxATR.CheckedChanged, cbxVollmacht.CheckedChanged, cbxSonstDok.CheckedChanged, cbxNichtLeserlich.CheckedChanged, cbxPackliste.CheckedChanged ' optDokumente.Checked = True End Sub Private Sub SonstChanged(sender As Object, e As EventArgs) Handles txtSonstigesDokumentFehlt.TextChanged diff --git a/Aviso/frmEintragAviso.designer.vb b/Aviso/frmEintragAviso.designer.vb index 8057132..4648210 100644 --- a/Aviso/frmEintragAviso.designer.vb +++ b/Aviso/frmEintragAviso.designer.vb @@ -92,7 +92,6 @@ Partial Class frmEintragAviso Me.Label16 = New System.Windows.Forms.Label() Me.cbxFrächterUnbekannt = New System.Windows.Forms.CheckBox() Me.btnAuftraggeber = New System.Windows.Forms.Button() - Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem() Me.btnAvisiererKd = New System.Windows.Forms.Button() Me.btnFraechterKd = New System.Windows.Forms.Button() Me.lblErrImex = New System.Windows.Forms.Label() @@ -103,7 +102,6 @@ Partial Class frmEintragAviso Me.lblErr_Frächter = New System.Windows.Forms.Label() Me.lblErr_LKW = New System.Windows.Forms.Label() Me.lblErr_Grenzstelle = New System.Windows.Forms.Label() - Me.lblErrFmZollKdNr = New System.Windows.Forms.Label() Me.Button1 = New System.Windows.Forms.Button() Me.btnAbsSrch = New System.Windows.Forms.Button() Me.lblAtrAvis = New System.Windows.Forms.Label() @@ -117,6 +115,8 @@ Partial Class frmEintragAviso Me.cbxWarenort = New System.Windows.Forms.CheckBox() Me.txtBestimmungszollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox() Me.lblZA = New System.Windows.Forms.Label() + Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem() + Me.lblErrFmZollKdNr = New System.Windows.Forms.Label() Me.grp = New System.Windows.Forms.GroupBox() Me.txtDyRef = New System.Windows.Forms.TextBox() Me.picDy = New System.Windows.Forms.PictureBox() @@ -145,6 +145,11 @@ Partial Class frmEintragAviso Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.clmnPfad = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.UsrCntlEintragAvisoAtilla = New AVISO.usrCntlEintragAvisoAtilla() + Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.dgvVorpapier = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.clmnArt = New System.Windows.Forms.DataGridViewComboBoxColumn() + Me.clmnMRN = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.PictureBox1 = New System.Windows.Forms.PictureBox() Me.panAdmin.SuspendLayout() Me.grpAviso.SuspendLayout() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() @@ -154,6 +159,9 @@ Partial Class frmEintragAviso Me.grpAktVerzollung.SuspendLayout() Me.pnlSBG.SuspendLayout() CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit() + Me.GroupBox1.SuspendLayout() + CType(Me.dgvVorpapier, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'btnOK @@ -161,7 +169,7 @@ Partial Class frmEintragAviso Me.btnOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnOK.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.btnOK.Location = New System.Drawing.Point(12, 601) + Me.btnOK.Location = New System.Drawing.Point(12, 650) Me.btnOK.Name = "btnOK" Me.btnOK.Size = New System.Drawing.Size(306, 45) Me.btnOK.TabIndex = 18 @@ -182,7 +190,7 @@ Partial Class frmEintragAviso Me.btnAbbruch.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.btnAbbruch.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnAbbruch.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.btnAbbruch.Location = New System.Drawing.Point(324, 601) + Me.btnAbbruch.Location = New System.Drawing.Point(324, 650) Me.btnAbbruch.Name = "btnAbbruch" Me.btnAbbruch.Size = New System.Drawing.Size(91, 45) Me.btnAbbruch.TabIndex = 19 @@ -193,19 +201,19 @@ Partial Class frmEintragAviso ' Me.txtInfo.AcceptsReturn = True Me.txtInfo.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.txtInfo.Location = New System.Drawing.Point(9, 415) + Me.txtInfo.Location = New System.Drawing.Point(424, 620) Me.txtInfo.MaxLength = 240 Me.txtInfo.Multiline = True Me.txtInfo.Name = "txtInfo" Me.txtInfo.ScrollBars = System.Windows.Forms.ScrollBars.Vertical - Me.txtInfo.Size = New System.Drawing.Size(388, 75) + Me.txtInfo.Size = New System.Drawing.Size(360, 75) Me.txtInfo.TabIndex = 49 ' 'Label3 ' Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(6, 399) + Me.Label3.Location = New System.Drawing.Point(421, 604) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(25, 13) Me.Label3.TabIndex = 48 @@ -232,7 +240,7 @@ Partial Class frmEintragAviso 'Label6 ' Me.Label6.AutoSize = True - Me.Label6.Location = New System.Drawing.Point(6, 125) + Me.Label6.Location = New System.Drawing.Point(25, 125) Me.Label6.Name = "Label6" Me.Label6.Size = New System.Drawing.Size(48, 13) Me.Label6.TabIndex = 13 @@ -251,7 +259,7 @@ Partial Class frmEintragAviso Me.txtÄnderungen.Name = "txtÄnderungen" Me.txtÄnderungen.ReadOnly = True Me.txtÄnderungen.ScrollBars = System.Windows.Forms.ScrollBars.Vertical - Me.txtÄnderungen.Size = New System.Drawing.Size(360, 400) + Me.txtÄnderungen.Size = New System.Drawing.Size(360, 352) Me.txtÄnderungen.TabIndex = 13 Me.txtÄnderungen.TabStop = False ' @@ -276,10 +284,10 @@ Partial Class frmEintragAviso 'txtLKW_Nr ' Me.txtLKW_Nr.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtLKW_Nr.Location = New System.Drawing.Point(9, 141) + Me.txtLKW_Nr.Location = New System.Drawing.Point(28, 141) Me.txtLKW_Nr.MaxLength = 30 Me.txtLKW_Nr.Name = "txtLKW_Nr" - Me.txtLKW_Nr.Size = New System.Drawing.Size(170, 26) + Me.txtLKW_Nr.Size = New System.Drawing.Size(162, 26) Me.txtLKW_Nr.TabIndex = 18 ' 'lblStatus @@ -330,7 +338,7 @@ Partial Class frmEintragAviso Me.panAdmin.Controls.Add(Me.Label8) Me.panAdmin.Controls.Add(Me.lblFreigabe) Me.panAdmin.Controls.Add(Me.lblAnkunft) - Me.panAdmin.Location = New System.Drawing.Point(543, 461) + Me.panAdmin.Location = New System.Drawing.Point(543, 413) Me.panAdmin.Name = "panAdmin" Me.panAdmin.Size = New System.Drawing.Size(253, 187) Me.panAdmin.TabIndex = 20 @@ -577,7 +585,7 @@ Partial Class frmEintragAviso ' Me.Label11.AutoSize = True Me.Label11.ForeColor = System.Drawing.Color.Black - Me.Label11.Location = New System.Drawing.Point(229, 125) + Me.Label11.Location = New System.Drawing.Point(240, 125) Me.Label11.Name = "Label11" Me.Label11.Size = New System.Drawing.Size(59, 13) Me.Label11.TabIndex = 16 @@ -671,7 +679,7 @@ Partial Class frmEintragAviso ' Me.Label12.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.Label12.BackColor = System.Drawing.Color.Transparent - Me.Label12.Location = New System.Drawing.Point(6, 491) + Me.Label12.Location = New System.Drawing.Point(421, 696) Me.Label12.Name = "Label12" Me.Label12.Size = New System.Drawing.Size(372, 32) Me.Label12.TabIndex = 52 @@ -698,7 +706,7 @@ Partial Class frmEintragAviso Me.cboGrenzstelle.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.cboGrenzstelle.FormattingEnabled = True Me.cboGrenzstelle.Items.AddRange(New Object() {"", "SUB", "SBG", "WAI", "NKD", "SFD", "NEU", "AMB", "???"}) - Me.cboGrenzstelle.Location = New System.Drawing.Point(232, 139) + Me.cboGrenzstelle.Location = New System.Drawing.Point(243, 139) Me.cboGrenzstelle.Name = "cboGrenzstelle" Me.cboGrenzstelle.Size = New System.Drawing.Size(74, 28) Me.cboGrenzstelle.TabIndex = 20 @@ -715,6 +723,7 @@ Partial Class frmEintragAviso ' 'grpAviso ' + Me.grpAviso.Controls.Add(Me.PictureBox1) Me.grpAviso.Controls.Add(Me.lblErr_KdNr) Me.grpAviso.Controls.Add(Me.Button5) Me.grpAviso.Controls.Add(Me.lblErrVorraussuchtlEintreffen) @@ -733,7 +742,6 @@ Partial Class frmEintragAviso Me.grpAviso.Controls.Add(Me.Label16) Me.grpAviso.Controls.Add(Me.cbxFrächterUnbekannt) Me.grpAviso.Controls.Add(Me.btnAuftraggeber) - Me.grpAviso.Controls.Add(Me.UsrCntlTestsystem1) Me.grpAviso.Controls.Add(Me.btnAvisiererKd) Me.grpAviso.Controls.Add(Me.btnFraechterKd) Me.grpAviso.Controls.Add(Me.lblErrImex) @@ -744,24 +752,19 @@ Partial Class frmEintragAviso Me.grpAviso.Controls.Add(Me.lblErr_Frächter) Me.grpAviso.Controls.Add(Me.lblErr_LKW) Me.grpAviso.Controls.Add(Me.lblErr_Grenzstelle) - Me.grpAviso.Controls.Add(Me.lblErrFmZollKdNr) Me.grpAviso.Controls.Add(Me.Button1) - Me.grpAviso.Controls.Add(Me.btnAbsSrch) Me.grpAviso.Controls.Add(Me.cbxHandling) Me.grpAviso.Controls.Add(Me.cboGrenzstelle) Me.grpAviso.Controls.Add(Me.Label10) Me.grpAviso.Controls.Add(Me.dtpAvisoEingangDatum) Me.grpAviso.Controls.Add(Me.optOhneAviso) - Me.grpAviso.Controls.Add(Me.Label12) Me.grpAviso.Controls.Add(Me.optAvisoEingang) Me.grpAviso.Controls.Add(Me.dtpAvisoEingangZeit) Me.grpAviso.Controls.Add(Me.Label11) Me.grpAviso.Controls.Add(Me.Label4) - Me.grpAviso.Controls.Add(Me.txtInfo) Me.grpAviso.Controls.Add(Me.lblAtrAvis) Me.grpAviso.Controls.Add(Me.lblAtr) Me.grpAviso.Controls.Add(Me.Label17) - Me.grpAviso.Controls.Add(Me.Label3) Me.grpAviso.Controls.Add(Me.Label5) Me.grpAviso.Controls.Add(Me.cbxAuftraggeberfurAlleSendungen) Me.grpAviso.Controls.Add(Me.Label6) @@ -771,7 +774,7 @@ Partial Class frmEintragAviso Me.grpAviso.Controls.Add(Me.pnl) Me.grpAviso.Location = New System.Drawing.Point(12, 45) Me.grpAviso.Name = "grpAviso" - Me.grpAviso.Size = New System.Drawing.Size(403, 520) + Me.grpAviso.Size = New System.Drawing.Size(403, 406) Me.grpAviso.TabIndex = 5 Me.grpAviso.TabStop = False Me.grpAviso.Text = "Aviso" @@ -942,7 +945,7 @@ Partial Class frmEintragAviso Me.sbLkwNationalitaet.INVISIBLE_COLUMNS = Nothing Me.sbLkwNationalitaet.key_visible = False Me.sbLkwNationalitaet.KEYPARAM = Nothing - Me.sbLkwNationalitaet.Location = New System.Drawing.Point(178, 141) + Me.sbLkwNationalitaet.Location = New System.Drawing.Point(189, 141) Me.sbLkwNationalitaet.MaxLength = 5 Me.sbLkwNationalitaet.Name = "sbLkwNationalitaet" Me.sbLkwNationalitaet.searchActive = True @@ -957,7 +960,7 @@ Partial Class frmEintragAviso 'Label18 ' Me.Label18.AutoSize = True - Me.Label18.Location = New System.Drawing.Point(176, 125) + Me.Label18.Location = New System.Drawing.Point(187, 125) Me.Label18.Name = "Label18" Me.Label18.Size = New System.Drawing.Size(27, 13) Me.Label18.TabIndex = 15 @@ -1036,18 +1039,6 @@ Partial Class frmEintragAviso Me.btnAuftraggeber.UseVisualStyleBackColor = True Me.btnAuftraggeber.Visible = False ' - 'UsrCntlTestsystem1 - ' - Me.UsrCntlTestsystem1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.UsrCntlTestsystem1.BackColor = System.Drawing.Color.Transparent - Me.UsrCntlTestsystem1.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.UsrCntlTestsystem1.ForeColor = System.Drawing.Color.Red - Me.UsrCntlTestsystem1.Location = New System.Drawing.Point(49, 453) - Me.UsrCntlTestsystem1.Margin = New System.Windows.Forms.Padding(5, 6, 5, 6) - Me.UsrCntlTestsystem1.Name = "UsrCntlTestsystem1" - Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28) - Me.UsrCntlTestsystem1.TabIndex = 51 - ' 'btnAvisiererKd ' Me.btnAvisiererKd.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom @@ -1101,7 +1092,7 @@ Partial Class frmEintragAviso Me.cboImEx.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.cboImEx.FormattingEnabled = True Me.cboImEx.Items.AddRange(New Object() {"", "IMPORT", "EXPORT"}) - Me.cboImEx.Location = New System.Drawing.Point(312, 139) + Me.cboImEx.Location = New System.Drawing.Point(323, 139) Me.cboImEx.Name = "cboImEx" Me.cboImEx.Size = New System.Drawing.Size(79, 28) Me.cboImEx.TabIndex = 21 @@ -1111,7 +1102,7 @@ Partial Class frmEintragAviso ' Me.Label1.AutoSize = True Me.Label1.ForeColor = System.Drawing.Color.Black - Me.Label1.Location = New System.Drawing.Point(309, 125) + Me.Label1.Location = New System.Drawing.Point(320, 125) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(35, 13) Me.Label1.TabIndex = 17 @@ -1173,18 +1164,6 @@ Partial Class frmEintragAviso Me.lblErr_Grenzstelle.Text = "Grenzstelle eingeben!" Me.lblErr_Grenzstelle.Visible = False ' - 'lblErrFmZollKdNr - ' - Me.lblErrFmZollKdNr.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.lblErrFmZollKdNr.AutoSize = True - Me.lblErrFmZollKdNr.ForeColor = System.Drawing.Color.Red - Me.lblErrFmZollKdNr.Location = New System.Drawing.Point(176, 431) - Me.lblErrFmZollKdNr.Name = "lblErrFmZollKdNr" - Me.lblErrFmZollKdNr.Size = New System.Drawing.Size(156, 26) - Me.lblErrFmZollKdNr.TabIndex = 50 - Me.lblErrFmZollKdNr.Text = "Wenn möglich bitte die FM-Zoll " & Global.Microsoft.VisualBasic.ChrW(10) & "Zuordnung mit KdNr eintragen!" - Me.lblErrFmZollKdNr.Visible = False - ' 'Button1 ' Me.Button1.FlatAppearance.BorderSize = 0 @@ -1202,7 +1181,7 @@ Partial Class frmEintragAviso Me.btnAbsSrch.FlatAppearance.BorderSize = 0 Me.btnAbsSrch.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnAbsSrch.Image = CType(resources.GetObject("btnAbsSrch.Image"), System.Drawing.Image) - Me.btnAbsSrch.Location = New System.Drawing.Point(360, 112) + Me.btnAbsSrch.Location = New System.Drawing.Point(447, 411) Me.btnAbsSrch.Name = "btnAbsSrch" Me.btnAbsSrch.Size = New System.Drawing.Size(37, 20) Me.btnAbsSrch.TabIndex = 12 @@ -1303,7 +1282,7 @@ Partial Class frmEintragAviso ' Me.cbxWarenort.AutoSize = True Me.cbxWarenort.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.cbxWarenort.Location = New System.Drawing.Point(300, 4) + Me.cbxWarenort.Location = New System.Drawing.Point(321, 4) Me.cbxWarenort.Name = "cbxWarenort" Me.cbxWarenort.Size = New System.Drawing.Size(70, 17) Me.cbxWarenort.TabIndex = 2 @@ -1328,7 +1307,7 @@ Partial Class frmEintragAviso Me.txtBestimmungszollstelle.MaxLength = 50 Me.txtBestimmungszollstelle.Name = "txtBestimmungszollstelle" Me.txtBestimmungszollstelle.searchActive = True - Me.txtBestimmungszollstelle.Size = New System.Drawing.Size(239, 20) + Me.txtBestimmungszollstelle.Size = New System.Drawing.Size(265, 20) Me.txtBestimmungszollstelle.SQL_ORDER_BY = Nothing Me.txtBestimmungszollstelle.SQL_SELECT = Nothing Me.txtBestimmungszollstelle.SQL_WHERE = Nothing @@ -1345,6 +1324,30 @@ Partial Class frmEintragAviso Me.lblZA.TabIndex = 0 Me.lblZA.Text = "Zollamt:" ' + 'UsrCntlTestsystem1 + ' + Me.UsrCntlTestsystem1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.UsrCntlTestsystem1.BackColor = System.Drawing.Color.Transparent + Me.UsrCntlTestsystem1.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.UsrCntlTestsystem1.ForeColor = System.Drawing.Color.Red + Me.UsrCntlTestsystem1.Location = New System.Drawing.Point(464, 658) + Me.UsrCntlTestsystem1.Margin = New System.Windows.Forms.Padding(5, 6, 5, 6) + Me.UsrCntlTestsystem1.Name = "UsrCntlTestsystem1" + Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28) + Me.UsrCntlTestsystem1.TabIndex = 51 + ' + 'lblErrFmZollKdNr + ' + Me.lblErrFmZollKdNr.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.lblErrFmZollKdNr.AutoSize = True + Me.lblErrFmZollKdNr.ForeColor = System.Drawing.Color.Red + Me.lblErrFmZollKdNr.Location = New System.Drawing.Point(591, 636) + Me.lblErrFmZollKdNr.Name = "lblErrFmZollKdNr" + Me.lblErrFmZollKdNr.Size = New System.Drawing.Size(156, 26) + Me.lblErrFmZollKdNr.TabIndex = 50 + Me.lblErrFmZollKdNr.Text = "Wenn möglich bitte die FM-Zoll " & Global.Microsoft.VisualBasic.ChrW(10) & "Zuordnung mit KdNr eintragen!" + Me.lblErrFmZollKdNr.Visible = False + ' 'grp ' Me.grp.Controls.Add(Me.optUnbekannt) @@ -1647,7 +1650,7 @@ Partial Class frmEintragAviso Me.cbxAktenzettelDrucken.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.cbxAktenzettelDrucken.BackColor = System.Drawing.Color.WhiteSmoke Me.cbxAktenzettelDrucken.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxAktenzettelDrucken.Location = New System.Drawing.Point(12, 571) + Me.cbxAktenzettelDrucken.Location = New System.Drawing.Point(12, 620) Me.cbxAktenzettelDrucken.Name = "cbxAktenzettelDrucken" Me.cbxAktenzettelDrucken.Size = New System.Drawing.Size(403, 33) Me.cbxAktenzettelDrucken.TabIndex = 11 @@ -1663,7 +1666,7 @@ Partial Class frmEintragAviso Me.cboPrinter.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.cboPrinter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.cboPrinter.FormattingEnabled = True - Me.cboPrinter.Location = New System.Drawing.Point(209, 576) + Me.cboPrinter.Location = New System.Drawing.Point(209, 625) Me.cboPrinter.Name = "cboPrinter" Me.cboPrinter.Size = New System.Drawing.Size(206, 21) Me.cboPrinter.TabIndex = 12 @@ -1682,12 +1685,12 @@ Partial Class frmEintragAviso Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvAnhaenge.ColumnHeadersVisible = False Me.dgvAnhaenge.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.columnName, Me.clmnPfad}) - Me.dgvAnhaenge.Location = New System.Drawing.Point(424, 321) + Me.dgvAnhaenge.Location = New System.Drawing.Point(424, 395) Me.dgvAnhaenge.Name = "dgvAnhaenge" Me.dgvAnhaenge.ReadOnly = True Me.dgvAnhaenge.RowHeadersVisible = False Me.dgvAnhaenge.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvAnhaenge.Size = New System.Drawing.Size(360, 327) + Me.dgvAnhaenge.Size = New System.Drawing.Size(360, 205) Me.dgvAnhaenge.TabIndex = 14 Me.dgvAnhaenge.Visible = False ' @@ -1714,13 +1717,68 @@ Partial Class frmEintragAviso Me.UsrCntlEintragAvisoAtilla.TabIndex = 6 Me.UsrCntlEintragAvisoAtilla.Visible = False ' + 'GroupBox1 + ' + Me.GroupBox1.Controls.Add(Me.dgvVorpapier) + Me.GroupBox1.Location = New System.Drawing.Point(12, 455) + Me.GroupBox1.Name = "GroupBox1" + Me.GroupBox1.Size = New System.Drawing.Size(403, 150) + Me.GroupBox1.TabIndex = 56 + Me.GroupBox1.TabStop = False + Me.GroupBox1.Text = "Vorpapiere" + ' + 'dgvVorpapier + ' + Me.dgvVorpapier.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvVorpapier.AllowUserToResizeColumns = False + Me.dgvVorpapier.AllowUserToResizeRows = False + Me.dgvVorpapier.BackgroundColor = System.Drawing.Color.White + Me.dgvVorpapier.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvVorpapier.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnArt, Me.clmnMRN}) + Me.dgvVorpapier.Location = New System.Drawing.Point(9, 19) + Me.dgvVorpapier.Name = "dgvVorpapier" + Me.dgvVorpapier.RowHeadersWidth = 25 + Me.dgvVorpapier.Size = New System.Drawing.Size(388, 126) + Me.dgvVorpapier.TabIndex = 36 + ' + 'clmnArt + ' + Me.clmnArt.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.ComboBox + Me.clmnArt.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.clmnArt.HeaderText = "Art" + Me.clmnArt.Items.AddRange(New Object() {"ATA", "MRN", "CRN"}) + Me.clmnArt.Name = "clmnArt" + Me.clmnArt.Resizable = System.Windows.Forms.DataGridViewTriState.[True] + Me.clmnArt.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic + Me.clmnArt.Visible = False + Me.clmnArt.Width = 60 + ' + 'clmnMRN + ' + Me.clmnMRN.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.clmnMRN.HeaderText = "T1 MRN" + Me.clmnMRN.Name = "clmnMRN" + ' + 'PictureBox1 + ' + Me.PictureBox1.BackgroundImage = Global.AVISO.My.Resources.Resources.lorry + Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox1.Location = New System.Drawing.Point(3, 143) + Me.PictureBox1.Name = "PictureBox1" + Me.PictureBox1.Size = New System.Drawing.Size(22, 24) + Me.PictureBox1.TabIndex = 48 + Me.PictureBox1.TabStop = False + ' 'frmEintragAviso ' Me.AcceptButton = Me.btnOK Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(792, 654) + Me.ClientSize = New System.Drawing.Size(792, 728) + Me.Controls.Add(Me.btnAbsSrch) + Me.Controls.Add(Me.panAdmin) + Me.Controls.Add(Me.GroupBox1) Me.Controls.Add(Me.grp) Me.Controls.Add(Me.txtDyRef) Me.Controls.Add(Me.picDy) @@ -1729,7 +1787,6 @@ Partial Class frmEintragAviso Me.Controls.Add(Me.cboPrinter) Me.Controls.Add(Me.cbxSendungsvorlagen) Me.Controls.Add(Me.Button3) - Me.Controls.Add(Me.panAdmin) Me.Controls.Add(Me.grpAktVerzollung) Me.Controls.Add(Me.grpAviso) Me.Controls.Add(Me.Label15) @@ -1739,10 +1796,15 @@ Partial Class frmEintragAviso Me.Controls.Add(Me.txtÄnderungen) Me.Controls.Add(Me.dtpDatum) Me.Controls.Add(Me.btnAbbruch) + Me.Controls.Add(Me.UsrCntlTestsystem1) Me.Controls.Add(Me.Label9) Me.Controls.Add(Me.btnOK) Me.Controls.Add(Me.cbxAktenzettelDrucken) Me.Controls.Add(Me.UsrCntlEintragAvisoAtilla) + Me.Controls.Add(Me.txtInfo) + Me.Controls.Add(Me.lblErrFmZollKdNr) + Me.Controls.Add(Me.Label3) + Me.Controls.Add(Me.Label12) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.KeyPreview = True @@ -1766,6 +1828,9 @@ Partial Class frmEintragAviso Me.pnlSBG.ResumeLayout(False) Me.pnlSBG.PerformLayout() CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).EndInit() + Me.GroupBox1.ResumeLayout(False) + CType(Me.dgvVorpapier, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -1892,4 +1957,9 @@ Partial Class frmEintragAviso Friend WithEvents lblErr_KdNr As Label Friend WithEvents cbxWarenort As CheckBox Friend WithEvents pnl As Panel + Friend WithEvents GroupBox1 As GroupBox + Friend WithEvents dgvVorpapier As VERAG_PROG_ALLGEMEIN.MyDatagridview + Friend WithEvents clmnArt As DataGridViewComboBoxColumn + Friend WithEvents clmnMRN As DataGridViewTextBoxColumn + Friend WithEvents PictureBox1 As PictureBox End Class diff --git a/Aviso/frmEintragAviso.resx b/Aviso/frmEintragAviso.resx index fbb6608..646e468 100644 --- a/Aviso/frmEintragAviso.resx +++ b/Aviso/frmEintragAviso.resx @@ -216,6 +216,24 @@ True + + True + + + True + + + True + + + True + + + True + + + True + AAABAAEAgIAAAAEAIAAoCAEAFgAAACgAAACAAAAAAAEAAAEAIAAAAAAAAAgBABMLAAATCwAAAAAAAAAA diff --git a/Aviso/frmEintragAviso.vb b/Aviso/frmEintragAviso.vb index 0e070df..3320617 100644 --- a/Aviso/frmEintragAviso.vb +++ b/Aviso/frmEintragAviso.vb @@ -395,7 +395,12 @@ Public Class frmEintragAviso panAdmin.Visible = bearb 'Administrator bekommt mehr Edit-Möglichkeiten End If - + 'Vorpapier laden + dgvVorpapier.Rows.Clear() + myAviso.LOAD_Vorpapiere() + For Each VP In myAviso.VORPAPIERE + dgvVorpapier.Rows.Add({VP.vp_Art, VP.vp_Nr}) + Next ' If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Then @@ -916,10 +921,27 @@ Public Class frmEintragAviso myAviso.TransportTemperatur = SDL.cProgramFunctions.isLeerNothing(UsrCntlEintragAvisoAtilla.txtTransporttemp.Text) myAviso.Zugmaschine = SDL.cProgramFunctions.isLeerNothing(UsrCntlEintragAvisoAtilla.txtZugmaschine.Text) End If + + Dim tmpId = AvisoDAL.SpeichernAviso(myAviso) + myAviso.AvisoID = tmpId AvisoDAL.addAenderung(tmpId, aendart, aendText) + 'VORPAPIERE + myAviso.VORPAPIERE.Clear() + For Each r As DataGridViewRow In dgvVorpapier.Rows + If r.Cells("clmnMRN").Value IsNot Nothing AndAlso r.Cells("clmnMRN").Value <> "" Then + Dim VP As New cAvisoVorpapier + VP.vp_AvisoId = tmpId + VP.vp_Nr = r.Cells("clmnMRN").Value + VP.vp_Art = "T1" 'r.Cells("clmnMRN").Value + myAviso.VORPAPIERE.Add(VP) + End If + Next + AvisoDAL.SpeichernAvisoVorpapiere(tmpId, myAviso.VORPAPIERE) + + 'Infotext als Vermerk: If txtInfo.Text.Trim <> "" Then If txtInfo.Text.Length <= 80 Then @@ -1697,4 +1719,8 @@ Public Class frmEintragAviso MsgBox(ex.Message & ex.StackTrace) End Try End Sub + + Private Sub Button5_Click_1(sender As Object, e As EventArgs) Handles Button5.Click + + End Sub End Class diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index d9ca57b..8510c33 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -627,7 +627,12 @@ Public Class frmHauptfenster 'Else 'r.Cells("LKW_fertig").Style.BackColor = Color.White End If - + If r.Cells("LKW_fertig").Value = "DE" Then + r.Cells("LKW_fertig").Style.ForeColor = Color.White + r.Cells("LKW_fertig").Style.BackColor = Color.Green + 'Else + 'r.Cells("LKW_fertig").Style.BackColor = Color.White + End If Next End With @@ -742,7 +747,7 @@ Public Class frmHauptfenster - Dim hSQL As String = "SELECT " & top & " AvisoID, Status, LKW_Nr, Auftraggeber, Frächter,VoraussichtlichesEintreffen, AvisoEingang, Ankunft, Dauer, Grenzstelle,letzterMitarbeiter, CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig], Datum, Vorbereitet, Vorgeschrieben, Freigabe, " + Dim hSQL As String = "SELECT " & top & " AvisoID, Status, LKW_Nr, Auftraggeber, Frächter,VoraussichtlichesEintreffen, AvisoEingang, Ankunft, Dauer, Grenzstelle,letzterMitarbeiter,CASE WHEN [ZOLLDigitalEingereicht] = 1 THEN 'DE' ELSE CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END END AS [LKW_fertig], Datum, Vorbereitet, Vorgeschrieben, Freigabe, " hSQL &= " Telefonisch, Info,Handling,AvisoTVHinweis,DATEDIFF(DAY,getdate(),[VoraussichtlichesEintreffen]) TageBisEintreffen " hSQL &= " FROM Aviso " hSQL &= " WHERE 1=1 " @@ -1245,6 +1250,7 @@ Public Class frmHauptfenster If r.Cells("LKW_fertig").Value = "OK" Then r.Cells("LKW_fertig").Style.BackColor = Color.FromArgb(0, 54, 128) + If r.Cells("LKW_fertig").Value = "DE" Then r.Cells("LKW_fertig").Style.BackColor = Color.Green If r.Cells("Dauer").Value > 120 Then r.Cells("DauerText").Style.ForeColor = Color.Red ' MsgBox(r.Cells("Dauer").Value) diff --git a/Aviso/frmSendungsdetailsNEU.Designer.vb b/Aviso/frmSendungsdetailsNEU.Designer.vb index 9eeee00..e20638c 100644 --- a/Aviso/frmSendungsdetailsNEU.Designer.vb +++ b/Aviso/frmSendungsdetailsNEU.Designer.vb @@ -339,6 +339,10 @@ Partial Class frmSendungsdetailsNEU Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem14 = New System.Windows.Forms.ToolStripMenuItem() Me.NurÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.cboVorpapier = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Label47 = New System.Windows.Forms.Label() + Me.txtVorpapierPos = New System.Windows.Forms.RichTextBox() + Me.Label48 = New System.Windows.Forms.Label() Me.pnl.SuspendLayout() Me.Panel4.SuspendLayout() Me.TabControl1.SuspendLayout() @@ -417,7 +421,7 @@ Partial Class frmSendungsdetailsNEU Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel4.Location = New System.Drawing.Point(0, 419) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(1214, 380) + Me.Panel4.Size = New System.Drawing.Size(1214, 357) Me.Panel4.TabIndex = 2 ' 'TabControl1 @@ -432,7 +436,7 @@ Partial Class frmSendungsdetailsNEU Me.TabControl1.Location = New System.Drawing.Point(0, 5) Me.TabControl1.Name = "TabControl1" Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(1214, 375) + Me.TabControl1.Size = New System.Drawing.Size(1214, 352) Me.TabControl1.TabIndex = 1 ' 'tbAnhang @@ -441,7 +445,7 @@ Partial Class frmSendungsdetailsNEU Me.tbAnhang.Controls.Add(Me.Panel19) Me.tbAnhang.Location = New System.Drawing.Point(4, 22) Me.tbAnhang.Name = "tbAnhang" - Me.tbAnhang.Size = New System.Drawing.Size(1206, 349) + Me.tbAnhang.Size = New System.Drawing.Size(1206, 326) Me.tbAnhang.TabIndex = 4 Me.tbAnhang.Text = "Anhang" Me.tbAnhang.UseVisualStyleBackColor = True @@ -470,7 +474,7 @@ Partial Class frmSendungsdetailsNEU Me.dgvAnhang.RowHeadersVisible = False Me.dgvAnhang.RowTemplate.Height = 40 Me.dgvAnhang.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvAnhang.Size = New System.Drawing.Size(1206, 304) + Me.dgvAnhang.Size = New System.Drawing.Size(1206, 281) Me.dgvAnhang.TabIndex = 1 ' 'cntxtAnh @@ -3863,6 +3867,10 @@ Partial Class frmSendungsdetailsNEU ' 'Panel7 ' + Me.Panel7.Controls.Add(Me.Label48) + Me.Panel7.Controls.Add(Me.txtVorpapierPos) + Me.Panel7.Controls.Add(Me.Label47) + Me.Panel7.Controls.Add(Me.cboVorpapier) Me.Panel7.Controls.Add(Me.lblgesGewicht) Me.Panel7.Controls.Add(Me.lblGesColli) Me.Panel7.Controls.Add(Me.Label44) @@ -3874,17 +3882,17 @@ Partial Class frmSendungsdetailsNEU Me.Panel7.Controls.Add(Me.btn) Me.Panel7.Controls.Add(Me.cbxSpedBuch) Me.Panel7.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel7.Location = New System.Drawing.Point(0, 799) + Me.Panel7.Location = New System.Drawing.Point(0, 776) Me.Panel7.MinimumSize = New System.Drawing.Size(0, 51) Me.Panel7.Name = "Panel7" - Me.Panel7.Size = New System.Drawing.Size(1214, 64) + Me.Panel7.Size = New System.Drawing.Size(1214, 87) Me.Panel7.TabIndex = 3 ' 'lblgesGewicht ' Me.lblgesGewicht.AutoSize = True Me.lblgesGewicht.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblgesGewicht.Location = New System.Drawing.Point(383, 33) + Me.lblgesGewicht.Location = New System.Drawing.Point(480, 59) Me.lblgesGewicht.Name = "lblgesGewicht" Me.lblgesGewicht.Size = New System.Drawing.Size(64, 13) Me.lblgesGewicht.TabIndex = 9 @@ -3894,7 +3902,7 @@ Partial Class frmSendungsdetailsNEU ' Me.lblGesColli.AutoSize = True Me.lblGesColli.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblGesColli.Location = New System.Drawing.Point(383, 18) + Me.lblGesColli.Location = New System.Drawing.Point(480, 44) Me.lblGesColli.Name = "lblGesColli" Me.lblGesColli.Size = New System.Drawing.Size(37, 13) Me.lblGesColli.TabIndex = 8 @@ -3903,7 +3911,7 @@ Partial Class frmSendungsdetailsNEU 'Label44 ' Me.Label44.AutoSize = True - Me.Label44.Location = New System.Drawing.Point(383, 3) + Me.Label44.Location = New System.Drawing.Point(428, 44) Me.Label44.Name = "Label44" Me.Label44.Size = New System.Drawing.Size(46, 13) Me.Label44.TabIndex = 7 @@ -3912,16 +3920,16 @@ Partial Class frmSendungsdetailsNEU 'lblGrenze ' Me.lblGrenze.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold) - Me.lblGrenze.Location = New System.Drawing.Point(137, 15) + Me.lblGrenze.Location = New System.Drawing.Point(204, 39) Me.lblGrenze.Name = "lblGrenze" - Me.lblGrenze.Size = New System.Drawing.Size(236, 44) + Me.lblGrenze.Size = New System.Drawing.Size(227, 44) Me.lblGrenze.TabIndex = 6 Me.lblGrenze.Text = "SUB" ' 'Label15 ' Me.Label15.AutoSize = True - Me.Label15.Location = New System.Drawing.Point(137, 0) + Me.Label15.Location = New System.Drawing.Point(138, 44) Me.Label15.Name = "Label15" Me.Label15.Size = New System.Drawing.Size(44, 13) Me.Label15.TabIndex = 4 @@ -3934,7 +3942,7 @@ Partial Class frmSendungsdetailsNEU Me.Button17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.Button17.Image = Global.AVISO.My.Resources.Resources.vermerk Me.Button17.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button17.Location = New System.Drawing.Point(485, 6) + Me.Button17.Location = New System.Drawing.Point(590, 6) Me.Button17.Name = "Button17" Me.Button17.Padding = New System.Windows.Forms.Padding(0, 0, 10, 0) Me.Button17.Size = New System.Drawing.Size(98, 40) @@ -3952,7 +3960,7 @@ Partial Class frmSendungsdetailsNEU Me.Panel3.Dock = System.Windows.Forms.DockStyle.Right Me.Panel3.Location = New System.Drawing.Point(691, 0) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(228, 64) + Me.Panel3.Size = New System.Drawing.Size(228, 87) Me.Panel3.TabIndex = 2 ' 'btnDelQS @@ -4013,7 +4021,7 @@ Partial Class frmSendungsdetailsNEU Me.Panel9.Dock = System.Windows.Forms.DockStyle.Right Me.Panel9.Location = New System.Drawing.Point(919, 0) Me.Panel9.Name = "Panel9" - Me.Panel9.Size = New System.Drawing.Size(295, 64) + Me.Panel9.Size = New System.Drawing.Size(295, 87) Me.Panel9.TabIndex = 3 ' 'Button10 @@ -4360,6 +4368,46 @@ Partial Class frmSendungsdetailsNEU Me.NurÖffnenToolStripMenuItem.Size = New System.Drawing.Size(247, 22) Me.NurÖffnenToolStripMenuItem.Text = "nur öffnen" ' + 'cboVorpapier + ' + Me.cboVorpapier._allowedValuesFreiText = Nothing + Me.cboVorpapier._allowFreiText = True + Me.cboVorpapier._value = "" + Me.cboVorpapier.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.cboVorpapier.FormattingEnabled = True + Me.cboVorpapier.Location = New System.Drawing.Point(208, 9) + Me.cboVorpapier.Name = "cboVorpapier" + Me.cboVorpapier.Size = New System.Drawing.Size(239, 24) + Me.cboVorpapier.TabIndex = 10 + ' + 'Label47 + ' + Me.Label47.AutoSize = True + Me.Label47.Location = New System.Drawing.Point(138, 9) + Me.Label47.Name = "Label47" + Me.Label47.Size = New System.Drawing.Size(59, 26) + Me.Label47.TabIndex = 11 + Me.Label47.Text = "Zuweisung" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Vorpapier:" + ' + 'txtVorpapierPos + ' + Me.txtVorpapierPos.Cursor = System.Windows.Forms.Cursors.IBeam + Me.txtVorpapierPos.Location = New System.Drawing.Point(483, 6) + Me.txtVorpapierPos.MaxLength = 500 + Me.txtVorpapierPos.Name = "txtVorpapierPos" + Me.txtVorpapierPos.Size = New System.Drawing.Size(100, 29) + Me.txtVorpapierPos.TabIndex = 12 + Me.txtVorpapierPos.Text = "" + ' + 'Label48 + ' + Me.Label48.AutoSize = True + Me.Label48.Location = New System.Drawing.Point(453, 14) + Me.Label48.Name = "Label48" + Me.Label48.Size = New System.Drawing.Size(28, 13) + Me.Label48.TabIndex = 13 + Me.Label48.Text = "Pos:" + ' 'frmSendungsdetailsNEU ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -4760,4 +4808,8 @@ Partial Class frmSendungsdetailsNEU Friend WithEvents btnUIDPruef As Button Friend WithEvents Panel21 As Panel Friend WithEvents Label53 As Label + Friend WithEvents Label48 As Label + Friend WithEvents txtVorpapierPos As RichTextBox + Friend WithEvents Label47 As Label + Friend WithEvents cboVorpapier As VERAG_PROG_ALLGEMEIN.MyComboBox End Class diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index 07a1381..2ae742d 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -29,6 +29,7 @@ Public Class frmSendungsdetailsNEU Dim usrcntl_NCTS As usrCntlSND_NCTSGestellungsadresse Dim usrcntl_FISKAL As usrCntlSND_NCTSFiskalEndempf Dim usrcntl_ATA As usrCntlSND_Handling + Dim usrcntl_ATB As usrCntlSND_ATBGestellung Sub New() @@ -240,6 +241,12 @@ Public Class frmSendungsdetailsNEU End If + cboVorpapier.Items.Clear() + AVISO.LOAD_Vorpapiere() + For Each VP In AVISO.VORPAPIERE + cboVorpapier.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(VP.vp_Nr, VP.vp_Nr)) + Next + If AVISO.Abgeschlossen Then Label8.Visible = True End If @@ -1129,6 +1136,11 @@ Public Class frmSendungsdetailsNEU txtFrachtfuehrer.Text = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Frachtfuehrer 'IIf(SENDUNG_LIST(CURRENT_INDEX).tblSnd_frachtfuehrer Is Nothing, "", SENDUNG_LIST(CURRENT_INDEX).tblSnd_frachtfuehrer) End If + + cboVorpapier.Text = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier + txtVorpapierPos.Text = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier_Pos + + initFraechterAvisererFromAkt() ''Übergangsphase Aviso/Sendung 'If txtAvisierer.Text = "" And txtAvisierer.Enabled And (VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(cboFiliale._value) = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX") Then @@ -1161,12 +1173,18 @@ Public Class frmSendungsdetailsNEU usrcntl_NCTS.reset() usrcntl_FISKAL.reset() usrcntl_ATA = New usrCntlSND_Handling(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID) + usrcntl_ATB = New usrCntlSND_ATBGestellung(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID) AddHandler usrcntl_ATA.HandlingWerte, Sub(colli, gewicht) txtColli.Text = colli txtGewicht.Text = gewicht End Sub + 'AddHandler usrcntl_ATB.HandlingWerte, Sub(colli, gewicht) + ' txtColli.Text = colli + ' txtGewicht.Text = gewicht + ' End Sub + ' txtT1Verzollungsadresse.Text = "" Select Case SENDUNG_LIST(CURRENT_INDEX).tblSnd_Abfertigungsart_ID Case 5, 6 @@ -1195,6 +1213,11 @@ Public Class frmSendungsdetailsNEU usrcntl_ATA.txtATAold.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATANr, "") usrcntl_ATA.txtATCMRNFremd.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATCMRN_Fremd, "") pnlT1.Controls.Add(usrcntl_ATA) + Case 44 + usrcntl_ATB.txtATBT1.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATB_T1, "") + usrcntl_ATB.txtATbNr.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATB_Nr, "") + + pnlT1.Controls.Add(usrcntl_ATB) End Select cboAbfertigungsart_SelectedIndexChanged(cboAbfertigungsart, New EventArgs) @@ -1503,6 +1526,11 @@ Public Class frmSendungsdetailsNEU SENDUNG_LIST(CURRENT_INDEX).HANDLING = usrcntl_ATA.GET_HANDLING() 'derzeit ohne Funktion SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATANr = usrcntl_ATA.GET_HANDLING_STRING() 'derzeit ohne Funktion End If + Case 44 + If pnlT1.Controls.Count > 0 AndAlso pnlT1.Controls(0).GetType Is GetType(usrCntlSND_ATBGestellung) Then + SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATB_T1 = usrcntl_ATB.txtATBT1.Text + SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATB_Nr = usrcntl_ATB.txtATBNr.Text + End If End Select @@ -1524,6 +1552,12 @@ Public Class frmSendungsdetailsNEU SENDUNG_LIST(CURRENT_INDEX).tblSnd_KdAuftragsNrAvisierer = txtKdAuftragsNrAvisierer.Text SENDUNG_LIST(CURRENT_INDEX).tblSnd_KdAuftragsNrEmpfaenger = txtKdAuftragsNrEmpfaenger.Text SENDUNG_LIST(CURRENT_INDEX).tblSnd_KdAuftragsNrFrachtfuehrer = txtKdAuftragsNrFrachtfuehrer.Text + + + SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier = cboVorpapier.Text + SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier_Pos = txtVorpapierPos.Text + + End Sub Function getint(o) As Integer Try @@ -1921,6 +1955,8 @@ Public Class frmSendungsdetailsNEU pnlT1.Controls.Add(usrcntl_FISKAL) Case "23" pnlT1.Controls.Add(usrcntl_ATA) + Case "44" + pnlT1.Controls.Add(usrcntl_ATB) End Select diff --git a/Aviso/usrCntlSND_ATBGestellung.Designer.vb b/Aviso/usrCntlSND_ATBGestellung.Designer.vb new file mode 100644 index 0000000..0e9839e --- /dev/null +++ b/Aviso/usrCntlSND_ATBGestellung.Designer.vb @@ -0,0 +1,164 @@ + +Partial Class usrCntlSND_ATBGestellung + Inherits System.Windows.Forms.UserControl + + 'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + + Private Sub InitializeComponent() + Me.pnlT1 = New System.Windows.Forms.Panel() + Me.txtATBT1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label4 = New System.Windows.Forms.Label() + Me.Label3 = New System.Windows.Forms.Label() + Me.txtT1VerzollungsadresseBestimmungszollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox() + Me.Label33 = New System.Windows.Forms.Label() + Me.txtATBNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.pnlT1.SuspendLayout() + Me.SuspendLayout() + ' + 'pnlT1 + ' + Me.pnlT1.Controls.Add(Me.txtATBNr) + Me.pnlT1.Controls.Add(Me.txtATBT1) + Me.pnlT1.Controls.Add(Me.Label4) + Me.pnlT1.Controls.Add(Me.Label3) + Me.pnlT1.Controls.Add(Me.txtT1VerzollungsadresseBestimmungszollstelle) + Me.pnlT1.Controls.Add(Me.Label33) + Me.pnlT1.Location = New System.Drawing.Point(0, 0) + Me.pnlT1.Name = "pnlT1" + Me.pnlT1.Size = New System.Drawing.Size(549, 101) + Me.pnlT1.TabIndex = 0 + ' + 'txtATBT1 + ' + Me.txtATBT1._DateTimeOnly = False + Me.txtATBT1._numbersOnly = False + Me.txtATBT1._numbersOnlyKommastellen = "" + Me.txtATBT1._Prozent = False + Me.txtATBT1._ShortDateNew = False + Me.txtATBT1._ShortDateOnly = False + Me.txtATBT1._TimeOnly = False + Me.txtATBT1._value = "" + Me.txtATBT1._Waehrung = False + Me.txtATBT1._WaehrungZeichen = True + Me.txtATBT1.ForeColor = System.Drawing.Color.Black + Me.txtATBT1.Location = New System.Drawing.Point(121, 11) + Me.txtATBT1.MaxLineLength = -1 + Me.txtATBT1.MaxLines_Warning = "" + Me.txtATBT1.MaxLines_Warning_Label = Nothing + Me.txtATBT1.Name = "txtATBT1" + Me.txtATBT1.Size = New System.Drawing.Size(269, 20) + Me.txtATBT1.TabIndex = 22 + ' + 'Label4 + ' + Me.Label4.AutoSize = True + Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label4.Location = New System.Drawing.Point(23, 33) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(92, 13) + Me.Label4.TabIndex = 20 + Me.Label4.Text = "ATB / Gestellung:" + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Location = New System.Drawing.Point(23, 75) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(51, 13) + Me.Label3.TabIndex = 15 + Me.Label3.Text = "Zollstelle:" + ' + 'txtT1VerzollungsadresseBestimmungszollstelle + ' + Me.txtT1VerzollungsadresseBestimmungszollstelle._allowFreitext = False + Me.txtT1VerzollungsadresseBestimmungszollstelle._AllowSetValue = False + Me.txtT1VerzollungsadresseBestimmungszollstelle._allowSpaceAsSplitter = False + Me.txtT1VerzollungsadresseBestimmungszollstelle._autoSizeGross = False + Me.txtT1VerzollungsadresseBestimmungszollstelle._hideIfListEmpty = True + Me.txtT1VerzollungsadresseBestimmungszollstelle._value = Nothing + Me.txtT1VerzollungsadresseBestimmungszollstelle.conn_art = "FMZOLL" + Me.txtT1VerzollungsadresseBestimmungszollstelle.dgvpos = "LEFT" + Me.txtT1VerzollungsadresseBestimmungszollstelle.DISPLAY_PARAM = Nothing + Me.txtT1VerzollungsadresseBestimmungszollstelle.INVISIBLE_COLUMNS = Nothing + Me.txtT1VerzollungsadresseBestimmungszollstelle.key_visible = False + Me.txtT1VerzollungsadresseBestimmungszollstelle.KEYPARAM = Nothing + Me.txtT1VerzollungsadresseBestimmungszollstelle.Location = New System.Drawing.Point(121, 72) + Me.txtT1VerzollungsadresseBestimmungszollstelle.MaxLength = 8 + Me.txtT1VerzollungsadresseBestimmungszollstelle.Name = "txtT1VerzollungsadresseBestimmungszollstelle" + Me.txtT1VerzollungsadresseBestimmungszollstelle.searchActive = True + Me.txtT1VerzollungsadresseBestimmungszollstelle.Size = New System.Drawing.Size(269, 20) + Me.txtT1VerzollungsadresseBestimmungszollstelle.SQL_ORDER_BY = Nothing + Me.txtT1VerzollungsadresseBestimmungszollstelle.SQL_SELECT = Nothing + Me.txtT1VerzollungsadresseBestimmungszollstelle.SQL_WHERE = Nothing + Me.txtT1VerzollungsadresseBestimmungszollstelle.SQL_WhereParamList = Nothing + Me.txtT1VerzollungsadresseBestimmungszollstelle.TabIndex = 16 + Me.txtT1VerzollungsadresseBestimmungszollstelle.usrcntl = Nothing + ' + 'Label33 + ' + Me.Label33.AutoSize = True + Me.Label33.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label33.Location = New System.Drawing.Point(23, 14) + Me.Label33.Name = "Label33" + Me.Label33.Size = New System.Drawing.Size(79, 13) + Me.Label33.TabIndex = 3 + Me.Label33.Text = "Vorpapier / T1:" + ' + 'txtATBNr + ' + Me.txtATBNr._DateTimeOnly = False + Me.txtATBNr._numbersOnly = False + Me.txtATBNr._numbersOnlyKommastellen = "" + Me.txtATBNr._Prozent = False + Me.txtATBNr._ShortDateNew = False + Me.txtATBNr._ShortDateOnly = False + Me.txtATBNr._TimeOnly = False + Me.txtATBNr._value = "" + Me.txtATBNr._Waehrung = False + Me.txtATBNr._WaehrungZeichen = True + Me.txtATBNr.ForeColor = System.Drawing.Color.Black + Me.txtATBNr.Location = New System.Drawing.Point(121, 30) + Me.txtATBNr.MaxLineLength = -1 + Me.txtATBNr.MaxLines_Warning = "" + Me.txtATBNr.MaxLines_Warning_Label = Nothing + Me.txtATBNr.Name = "txtATBNr" + Me.txtATBNr.Size = New System.Drawing.Size(269, 20) + Me.txtATBNr.TabIndex = 23 + ' + 'usrCntlSND_ATBGestellung + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.pnlT1) + Me.Name = "usrCntlSND_ATBGestellung" + Me.Size = New System.Drawing.Size(549, 94) + Me.pnlT1.ResumeLayout(False) + Me.pnlT1.PerformLayout() + Me.ResumeLayout(False) + + End Sub + Friend WithEvents pnlT1 As System.Windows.Forms.Panel + Friend WithEvents Label33 As System.Windows.Forms.Label + Friend WithEvents txtT1VerzollungsadresseBestimmungszollstelle As VERAG_PROG_ALLGEMEIN.MySearchBox + Friend WithEvents Label3 As System.Windows.Forms.Label + Friend WithEvents txtATBT1 As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label4 As Label + Friend WithEvents txtATBNr As VERAG_PROG_ALLGEMEIN.MyTextBox +End Class diff --git a/Aviso/usrCntlSND_ATBGestellung.resx b/Aviso/usrCntlSND_ATBGestellung.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Aviso/usrCntlSND_ATBGestellung.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Aviso/usrCntlSND_ATBGestellung.vb b/Aviso/usrCntlSND_ATBGestellung.vb new file mode 100644 index 0000000..e1d5df7 --- /dev/null +++ b/Aviso/usrCntlSND_ATBGestellung.vb @@ -0,0 +1,49 @@ +Public Class usrCntlSND_ATBGestellung + + 'Public NCTS_GA As VERAG_PROG_ALLGEMEIN.cNCTSGestellungsadressen + + + Sub New(SendungsId) + + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + + End Sub + + + + 'Public Sub setValues() + ' txtATBT1.Text = If(NCTS_GA.nga_name, "") + ' txtT1VerzollungsadresseStrasse.Text = If(NCTS_GA.nga_strasse, "") + ' txtT1VerzollungsadressePlz.Text = If(NCTS_GA.nga_plz, "") + ' txtT1VerzollungsadresseOrt.Text = If(NCTS_GA.nga_ort, "") + ' sbT1VerzollungsadresseLand.SET_VALUE(If(NCTS_GA.nga_land, "")) + + ' txtT1VerzollungsadresseAnspr.Text = If(NCTS_GA.nga_Ansprechpartner, "") + ' txtT1VerzollungsadresseEORI.Text = If(NCTS_GA.nga_EORI, "") + ' txtT1VerzollungsadresseEORI_NL.Text = If(NCTS_GA.nga_EORI_NL, "") + ' txtT1VerzollungsadresseBestimmungszollstelle.SET_VALUE(If(NCTS_GA.nga_bestZollst, "")) + + + ' lblNGAId.Text = If(NCTS_GA.nga_id > 0, NCTS_GA.nga_id, "-") + ' picDel.Visible = (NCTS_GA.nga_id > 0) + 'End Sub + + + 'Public Sub getValues() + ' NCTS_GA.nga_name = txtATBT1.Text + ' NCTS_GA.nga_strasse = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseStrasse.Text) + ' NCTS_GA.nga_plz = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadressePlz.Text) + ' NCTS_GA.nga_ort = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseOrt.Text) + ' NCTS_GA.nga_land = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(sbT1VerzollungsadresseLand._value) + + ' NCTS_GA.nga_Ansprechpartner = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseAnspr.Text) + ' NCTS_GA.nga_EORI = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseEORI.Text) + ' NCTS_GA.nga_EORI_NL = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseEORI_NL.Text) + ' NCTS_GA.nga_bestZollst = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseBestimmungszollstelle._value) + 'End Sub + + +End Class diff --git a/Aviso/usrcntlAktDetails.Designer.vb b/Aviso/usrcntlAktDetails.Designer.vb index 96566df..6206bec 100644 --- a/Aviso/usrcntlAktDetails.Designer.vb +++ b/Aviso/usrcntlAktDetails.Designer.vb @@ -64,6 +64,7 @@ Partial Class usrcntlAktDetails Me.Panel7 = New System.Windows.Forms.Panel() Me.picArrowDown = New System.Windows.Forms.PictureBox() Me.Panel4 = New System.Windows.Forms.Panel() + Me.Button15 = New System.Windows.Forms.Button() Me.btnSendungslisteUNISPED = New System.Windows.Forms.Button() Me.cbxAlleFirmen = New System.Windows.Forms.CheckBox() Me.Button12 = New System.Windows.Forms.Button() @@ -75,6 +76,8 @@ Partial Class usrcntlAktDetails Me.Button10 = New System.Windows.Forms.Button() Me.Button9 = New System.Windows.Forms.Button() Me.btnKasse_LG = New System.Windows.Forms.Button() + Me.cbxLZRg = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components) + Me.cbxLZT1 = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components) Me.Button18 = New System.Windows.Forms.Button() Me.gridVermerke = New System.Windows.Forms.DataGridView() Me.pnlVermerkeTop = New System.Windows.Forms.Panel() @@ -202,10 +205,9 @@ Partial Class usrcntlAktDetails Me.pnlDetailsRechts.Controls.Add(Me.pnl) Me.pnlDetailsRechts.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlDetailsRechts.Location = New System.Drawing.Point(0, 0) - Me.pnlDetailsRechts.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.pnlDetailsRechts.MinimumSize = New System.Drawing.Size(300, 0) + Me.pnlDetailsRechts.MinimumSize = New System.Drawing.Size(200, 0) Me.pnlDetailsRechts.Name = "pnlDetailsRechts" - Me.pnlDetailsRechts.Size = New System.Drawing.Size(862, 874) + Me.pnlDetailsRechts.Size = New System.Drawing.Size(575, 721) Me.pnlDetailsRechts.TabIndex = 81 ' 'Panel3 @@ -214,19 +216,17 @@ Partial Class usrcntlAktDetails Me.Panel3.Controls.Add(Me.SplitContainer) Me.Panel3.Controls.Add(Me.Panel8) Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill - Me.Panel3.Location = New System.Drawing.Point(0, 142) - Me.Panel3.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Panel3.Location = New System.Drawing.Point(0, 105) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(867, 706) + Me.Panel3.Size = New System.Drawing.Size(575, 616) Me.Panel3.TabIndex = 91 ' 'SplitContainer ' Me.SplitContainer.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplitContainer.ImeMode = System.Windows.Forms.ImeMode.[On] + Me.SplitContainer.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.SplitContainer.IsSplitterFixed = True - Me.SplitContainer.Location = New System.Drawing.Point(0, 179) - Me.SplitContainer.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.SplitContainer.Location = New System.Drawing.Point(0, 120) Me.SplitContainer.Name = "SplitContainer" Me.SplitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal ' @@ -245,9 +245,8 @@ Partial Class usrcntlAktDetails Me.SplitContainer.Panel2.Controls.Add(Me.pnlVermerkeTop) Me.SplitContainer.Panel2.Controls.Add(Me.addVermerk) Me.SplitContainer.Panel2.Controls.Add(Me.pnlMAInfo) - Me.SplitContainer.Size = New System.Drawing.Size(867, 527) - Me.SplitContainer.SplitterDistance = 245 - Me.SplitContainer.SplitterWidth = 6 + Me.SplitContainer.Size = New System.Drawing.Size(575, 496) + Me.SplitContainer.SplitterDistance = 230 Me.SplitContainer.TabIndex = 91 ' 'pnlAlt @@ -259,9 +258,8 @@ Partial Class usrcntlAktDetails Me.pnlAlt.Controls.Add(Me.btn) Me.pnlAlt.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlAlt.Location = New System.Drawing.Point(0, 0) - Me.pnlAlt.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.pnlAlt.Name = "pnlAlt" - Me.pnlAlt.Size = New System.Drawing.Size(867, 245) + Me.pnlAlt.Size = New System.Drawing.Size(575, 230) Me.pnlAlt.TabIndex = 72 Me.pnlAlt.Visible = False ' @@ -269,10 +267,9 @@ Partial Class usrcntlAktDetails ' Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Button1.Location = New System.Drawing.Point(12, 183) - Me.Button1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button1.Location = New System.Drawing.Point(8, 122) Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(704, 56) + Me.Button1.Size = New System.Drawing.Size(469, 37) Me.Button1.TabIndex = 102 Me.Button1.Text = "Sendungen erstellen" Me.Button1.UseVisualStyleBackColor = True @@ -287,11 +284,9 @@ Partial Class usrcntlAktDetails Me.grpAktVerzollung.Controls.Add(Me.txtSendungen) Me.grpAktVerzollung.Controls.Add(Me.pnlSBG) Me.grpAktVerzollung.Controls.Add(Me.cbxSammelakt) - Me.grpAktVerzollung.Location = New System.Drawing.Point(12, 9) - Me.grpAktVerzollung.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpAktVerzollung.Location = New System.Drawing.Point(8, 6) Me.grpAktVerzollung.Name = "grpAktVerzollung" - Me.grpAktVerzollung.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.grpAktVerzollung.Size = New System.Drawing.Size(704, 165) + Me.grpAktVerzollung.Size = New System.Drawing.Size(469, 110) Me.grpAktVerzollung.TabIndex = 101 Me.grpAktVerzollung.TabStop = False Me.grpAktVerzollung.Text = "Sendungen - Details" @@ -300,10 +295,9 @@ Partial Class usrcntlAktDetails ' Me.lblSendungsanzahl.AutoSize = True Me.lblSendungsanzahl.ForeColor = System.Drawing.Color.Red - Me.lblSendungsanzahl.Location = New System.Drawing.Point(546, 108) - Me.lblSendungsanzahl.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSendungsanzahl.Location = New System.Drawing.Point(364, 72) Me.lblSendungsanzahl.Name = "lblSendungsanzahl" - Me.lblSendungsanzahl.Size = New System.Drawing.Size(120, 40) + Me.lblSendungsanzahl.Size = New System.Drawing.Size(80, 26) Me.lblSendungsanzahl.TabIndex = 13 Me.lblSendungsanzahl.Text = "Sendugsanzahl" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "angeben!" Me.lblSendungsanzahl.TextAlign = System.Drawing.ContentAlignment.TopRight @@ -315,10 +309,9 @@ Partial Class usrcntlAktDetails Me.cbxPosNr.Checked = True Me.cbxPosNr.CheckState = System.Windows.Forms.CheckState.Checked Me.cbxPosNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxPosNr.Location = New System.Drawing.Point(232, 32) - Me.cbxPosNr.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cbxPosNr.Location = New System.Drawing.Point(155, 21) Me.cbxPosNr.Name = "cbxPosNr" - Me.cbxPosNr.Size = New System.Drawing.Size(289, 24) + Me.cbxPosNr.Size = New System.Drawing.Size(194, 17) Me.cbxPosNr.TabIndex = 14 Me.cbxPosNr.Text = "Positionsnummern autom. vergeben" Me.cbxPosNr.UseVisualStyleBackColor = True @@ -331,30 +324,27 @@ Partial Class usrcntlAktDetails Me.cboGrenzstelle.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.cboGrenzstelle.FormattingEnabled = True Me.cboGrenzstelle.Items.AddRange(New Object() {"", "SUB", "SBG", "WAI", "NKD", "???"}) - Me.cboGrenzstelle.Location = New System.Drawing.Point(556, 60) - Me.cboGrenzstelle.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cboGrenzstelle.Location = New System.Drawing.Point(371, 40) Me.cboGrenzstelle.Name = "cboGrenzstelle" - Me.cboGrenzstelle.Size = New System.Drawing.Size(109, 37) + Me.cboGrenzstelle.Size = New System.Drawing.Size(74, 28) Me.cboGrenzstelle.TabIndex = 15 ' 'Label11 ' Me.Label11.AutoSize = True Me.Label11.ForeColor = System.Drawing.Color.Black - Me.Label11.Location = New System.Drawing.Point(552, 33) - Me.Label11.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label11.Location = New System.Drawing.Point(368, 22) Me.Label11.Name = "Label11" - Me.Label11.Size = New System.Drawing.Size(90, 20) + Me.Label11.Size = New System.Drawing.Size(59, 13) Me.Label11.TabIndex = 14 Me.Label11.Text = "Grenzstelle" ' 'lnlSendungText ' Me.lnlSendungText.AutoSize = True - Me.lnlSendungText.Location = New System.Drawing.Point(90, 38) - Me.lnlSendungText.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lnlSendungText.Location = New System.Drawing.Point(60, 25) Me.lnlSendungText.Name = "lnlSendungText" - Me.lnlSendungText.Size = New System.Drawing.Size(74, 20) + Me.lnlSendungText.Size = New System.Drawing.Size(50, 13) Me.lnlSendungText.TabIndex = 2 Me.lnlSendungText.Text = "Sendung" ' @@ -372,13 +362,12 @@ Partial Class usrcntlAktDetails Me.txtSendungen._WaehrungZeichen = True Me.txtSendungen.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtSendungen.ForeColor = System.Drawing.Color.Black - Me.txtSendungen.Location = New System.Drawing.Point(33, 26) - Me.txtSendungen.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.txtSendungen.Location = New System.Drawing.Point(22, 17) Me.txtSendungen.MaxLineLength = -1 Me.txtSendungen.MaxLines_Warning = "" Me.txtSendungen.MaxLines_Warning_Label = Nothing Me.txtSendungen.Name = "txtSendungen" - Me.txtSendungen.Size = New System.Drawing.Size(46, 35) + Me.txtSendungen.Size = New System.Drawing.Size(32, 26) Me.txtSendungen.TabIndex = 1 Me.txtSendungen.Text = "1" Me.txtSendungen.TextAlign = System.Windows.Forms.HorizontalAlignment.Right @@ -394,19 +383,17 @@ Partial Class usrcntlAktDetails Me.pnlSBG.Controls.Add(Me.txtSndFiskalDE) Me.pnlSBG.Controls.Add(Me.lblFiskAT) Me.pnlSBG.Controls.Add(Me.txtSndFiskalAT) - Me.pnlSBG.Location = New System.Drawing.Point(9, 62) - Me.pnlSBG.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.pnlSBG.Location = New System.Drawing.Point(6, 41) Me.pnlSBG.Name = "pnlSBG" - Me.pnlSBG.Size = New System.Drawing.Size(426, 94) + Me.pnlSBG.Size = New System.Drawing.Size(284, 63) Me.pnlSBG.TabIndex = 3 ' 'lblSndFremd ' Me.lblSndFremd.AutoSize = True - Me.lblSndFremd.Location = New System.Drawing.Point(280, 20) - Me.lblSndFremd.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSndFremd.Location = New System.Drawing.Point(187, 13) Me.lblSndFremd.Name = "lblSndFremd" - Me.lblSndFremd.Size = New System.Drawing.Size(119, 20) + Me.lblSndFremd.Size = New System.Drawing.Size(78, 13) Me.lblSndFremd.TabIndex = 84 Me.lblSndFremd.Text = "Fremdspedition" Me.lblSndFremd.Visible = False @@ -414,10 +401,9 @@ Partial Class usrcntlAktDetails 'Label21 ' Me.Label21.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label21.Location = New System.Drawing.Point(297, 56) - Me.Label21.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label21.Location = New System.Drawing.Point(198, 37) Me.Label21.Name = "Label21" - Me.Label21.Size = New System.Drawing.Size(44, 30) + Me.Label21.Size = New System.Drawing.Size(29, 20) Me.Label21.TabIndex = 9 Me.Label21.Text = "1" Me.Label21.TextAlign = System.Drawing.ContentAlignment.TopRight @@ -436,13 +422,12 @@ Partial Class usrcntlAktDetails Me.txtSndFremd._WaehrungZeichen = True Me.txtSndFremd.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtSndFremd.ForeColor = System.Drawing.Color.Black - Me.txtSndFremd.Location = New System.Drawing.Point(224, 8) - Me.txtSndFremd.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.txtSndFremd.Location = New System.Drawing.Point(149, 5) Me.txtSndFremd.MaxLineLength = -1 Me.txtSndFremd.MaxLines_Warning = "" Me.txtSndFremd.MaxLines_Warning_Label = Nothing Me.txtSndFremd.Name = "txtSndFremd" - Me.txtSndFremd.Size = New System.Drawing.Size(46, 35) + Me.txtSndFremd.Size = New System.Drawing.Size(32, 26) Me.txtSndFremd.TabIndex = 83 Me.txtSndFremd.Text = "0" Me.txtSndFremd.TextAlign = System.Windows.Forms.HorizontalAlignment.Right @@ -451,30 +436,27 @@ Partial Class usrcntlAktDetails 'Label20 ' Me.Label20.AutoSize = True - Me.Label20.Location = New System.Drawing.Point(342, 63) - Me.Label20.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label20.Location = New System.Drawing.Point(228, 42) Me.Label20.Name = "Label20" - Me.Label20.Size = New System.Drawing.Size(74, 20) + Me.Label20.Size = New System.Drawing.Size(50, 13) Me.Label20.TabIndex = 8 Me.Label20.Text = "Sendung" ' 'Label19 ' Me.Label19.AutoSize = True - Me.Label19.Location = New System.Drawing.Point(219, 63) - Me.Label19.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label19.Location = New System.Drawing.Point(146, 42) Me.Label19.Name = "Label19" - Me.Label19.Size = New System.Drawing.Size(70, 20) + Me.Label19.Size = New System.Drawing.Size(46, 13) Me.Label19.TabIndex = 7 Me.Label19.Text = "Gesamt:" ' 'lblFiskde ' Me.lblFiskde.AutoSize = True - Me.lblFiskde.Location = New System.Drawing.Point(81, 63) - Me.lblFiskde.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblFiskde.Location = New System.Drawing.Point(54, 42) Me.lblFiskde.Name = "lblFiskde" - Me.lblFiskde.Size = New System.Drawing.Size(77, 20) + Me.lblFiskde.Size = New System.Drawing.Size(52, 13) Me.lblFiskde.TabIndex = 6 Me.lblFiskde.Text = "Fiskal DE" ' @@ -492,13 +474,12 @@ Partial Class usrcntlAktDetails Me.txtSndFiskalDE._WaehrungZeichen = True Me.txtSndFiskalDE.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtSndFiskalDE.ForeColor = System.Drawing.Color.Black - Me.txtSndFiskalDE.Location = New System.Drawing.Point(24, 51) - Me.txtSndFiskalDE.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.txtSndFiskalDE.Location = New System.Drawing.Point(16, 34) Me.txtSndFiskalDE.MaxLineLength = -1 Me.txtSndFiskalDE.MaxLines_Warning = "" Me.txtSndFiskalDE.MaxLines_Warning_Label = Nothing Me.txtSndFiskalDE.Name = "txtSndFiskalDE" - Me.txtSndFiskalDE.Size = New System.Drawing.Size(46, 35) + Me.txtSndFiskalDE.Size = New System.Drawing.Size(32, 26) Me.txtSndFiskalDE.TabIndex = 5 Me.txtSndFiskalDE.Text = "0" Me.txtSndFiskalDE.TextAlign = System.Windows.Forms.HorizontalAlignment.Right @@ -506,10 +487,9 @@ Partial Class usrcntlAktDetails 'lblFiskAT ' Me.lblFiskAT.AutoSize = True - Me.lblFiskAT.Location = New System.Drawing.Point(81, 20) - Me.lblFiskAT.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblFiskAT.Location = New System.Drawing.Point(54, 13) Me.lblFiskAT.Name = "lblFiskAT" - Me.lblFiskAT.Size = New System.Drawing.Size(74, 20) + Me.lblFiskAT.Size = New System.Drawing.Size(51, 13) Me.lblFiskAT.TabIndex = 4 Me.lblFiskAT.Text = "Fiskal AT" ' @@ -527,13 +507,12 @@ Partial Class usrcntlAktDetails Me.txtSndFiskalAT._WaehrungZeichen = True Me.txtSndFiskalAT.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtSndFiskalAT.ForeColor = System.Drawing.Color.Black - Me.txtSndFiskalAT.Location = New System.Drawing.Point(24, 8) - Me.txtSndFiskalAT.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.txtSndFiskalAT.Location = New System.Drawing.Point(16, 5) Me.txtSndFiskalAT.MaxLineLength = -1 Me.txtSndFiskalAT.MaxLines_Warning = "" Me.txtSndFiskalAT.MaxLines_Warning_Label = Nothing Me.txtSndFiskalAT.Name = "txtSndFiskalAT" - Me.txtSndFiskalAT.Size = New System.Drawing.Size(46, 35) + Me.txtSndFiskalAT.Size = New System.Drawing.Size(32, 26) Me.txtSndFiskalAT.TabIndex = 3 Me.txtSndFiskalAT.Text = "0" Me.txtSndFiskalAT.TextAlign = System.Windows.Forms.HorizontalAlignment.Right @@ -542,10 +521,9 @@ Partial Class usrcntlAktDetails ' Me.cbxSammelakt.AutoSize = True Me.cbxSammelakt.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxSammelakt.Location = New System.Drawing.Point(232, 28) - Me.cbxSammelakt.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cbxSammelakt.Location = New System.Drawing.Point(155, 19) Me.cbxSammelakt.Name = "cbxSammelakt" - Me.cbxSammelakt.Size = New System.Drawing.Size(136, 29) + Me.cbxSammelakt.Size = New System.Drawing.Size(96, 21) Me.cbxSammelakt.TabIndex = 0 Me.cbxSammelakt.Text = "Sammelakt" Me.cbxSammelakt.UseVisualStyleBackColor = True @@ -556,10 +534,9 @@ Partial Class usrcntlAktDetails Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button5.Image = Global.AVISO.My.Resources.Resources.plus Me.Button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button5.Location = New System.Drawing.Point(592, 93) - Me.Button5.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button5.Location = New System.Drawing.Point(395, 62) Me.Button5.Name = "Button5" - Me.Button5.Size = New System.Drawing.Size(243, 56) + Me.Button5.Size = New System.Drawing.Size(162, 37) Me.Button5.TabIndex = 100 Me.Button5.Text = "Sendung erstellen" Me.Button5.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -571,10 +548,9 @@ Partial Class usrcntlAktDetails Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button3.Image = Global.AVISO.My.Resources.Resources.vermerk Me.Button3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button3.Location = New System.Drawing.Point(591, 158) - Me.Button3.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button3.Location = New System.Drawing.Point(394, 105) Me.Button3.Name = "Button3" - Me.Button3.Size = New System.Drawing.Size(243, 56) + Me.Button3.Size = New System.Drawing.Size(162, 37) Me.Button3.TabIndex = 99 Me.Button3.Text = "Sendungs-Vermerk" Me.Button3.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -586,10 +562,9 @@ Partial Class usrcntlAktDetails Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btn.Image = Global.AVISO.My.Resources.Resources.spedbuch_small Me.btn.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btn.Location = New System.Drawing.Point(591, 28) - Me.btn.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.btn.Location = New System.Drawing.Point(394, 19) Me.btn.Name = "btn" - Me.btn.Size = New System.Drawing.Size(243, 56) + Me.btn.Size = New System.Drawing.Size(162, 37) Me.btn.TabIndex = 97 Me.btn.Text = "Eintrag Speditionsbuch" Me.btn.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -624,7 +599,6 @@ Partial Class usrcntlAktDetails Me.dgvSendungen.DefaultCellStyle = DataGridViewCellStyle3 Me.dgvSendungen.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvSendungen.Location = New System.Drawing.Point(0, 0) - Me.dgvSendungen.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.dgvSendungen.MultiSelect = False Me.dgvSendungen.Name = "dgvSendungen" Me.dgvSendungen.ReadOnly = True @@ -646,7 +620,7 @@ Partial Class usrcntlAktDetails Me.dgvSendungen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvSendungen.ShowCellErrors = False Me.dgvSendungen.ShowRowErrors = False - Me.dgvSendungen.Size = New System.Drawing.Size(867, 245) + Me.dgvSendungen.Size = New System.Drawing.Size(575, 230) Me.dgvSendungen.TabIndex = 71 Me.dgvSendungen.TabStop = False ' @@ -655,11 +629,10 @@ Partial Class usrcntlAktDetails Me.Panel7.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.Panel7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.Panel7.Location = New System.Drawing.Point(6, 28) - Me.Panel7.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.Panel7.MaximumSize = New System.Drawing.Size(2, 374) + Me.Panel7.Location = New System.Drawing.Point(4, 19) + Me.Panel7.MaximumSize = New System.Drawing.Size(2, 250) Me.Panel7.Name = "Panel7" - Me.Panel7.Size = New System.Drawing.Size(0, 57) + Me.Panel7.Size = New System.Drawing.Size(1, 105) Me.Panel7.TabIndex = 15 ' 'picArrowDown @@ -668,10 +641,9 @@ Partial Class usrcntlAktDetails Me.picArrowDown.BackgroundImage = Global.AVISO.My.Resources.Resources.arrow_down_orange Me.picArrowDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch Me.picArrowDown.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.picArrowDown.Location = New System.Drawing.Point(2, 224) - Me.picArrowDown.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.picArrowDown.Location = New System.Drawing.Point(1, 225) Me.picArrowDown.Name = "picArrowDown" - Me.picArrowDown.Size = New System.Drawing.Size(50, 50) + Me.picArrowDown.Size = New System.Drawing.Size(34, 34) Me.picArrowDown.TabIndex = 104 Me.picArrowDown.TabStop = False Me.picArrowDown.Visible = False @@ -681,6 +653,7 @@ Partial Class usrcntlAktDetails Me.Panel4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Panel4.BackColor = System.Drawing.Color.PapayaWhip Me.Panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Panel4.Controls.Add(Me.Button15) Me.Panel4.Controls.Add(Me.btnSendungslisteUNISPED) Me.Panel4.Controls.Add(Me.cbxAlleFirmen) Me.Panel4.Controls.Add(Me.Button12) @@ -692,13 +665,31 @@ Partial Class usrcntlAktDetails Me.Panel4.Controls.Add(Me.Button10) Me.Panel4.Controls.Add(Me.Button9) Me.Panel4.Controls.Add(Me.btnKasse_LG) - Me.Panel4.Location = New System.Drawing.Point(310, 40) - Me.Panel4.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Panel4.Controls.Add(Me.cbxLZRg) + Me.Panel4.Controls.Add(Me.cbxLZT1) + Me.Panel4.Location = New System.Drawing.Point(204, 27) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(396, 287) + Me.Panel4.Size = New System.Drawing.Size(265, 227) Me.Panel4.TabIndex = 102 Me.Panel4.Visible = False ' + 'Button15 + ' + Me.Button15.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button15.BackColor = System.Drawing.Color.White + Me.Button15.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.Button15.ForeColor = System.Drawing.Color.Black + Me.Button15.Image = Global.AVISO.My.Resources.Resources.digitalerAkt_small + Me.Button15.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button15.Location = New System.Drawing.Point(134, 57) + Me.Button15.Name = "Button15" + Me.Button15.Size = New System.Drawing.Size(128, 36) + Me.Button15.TabIndex = 113 + Me.Button15.Text = "Laufzettel" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "DIGITAL" + Me.Button15.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button15.UseVisualStyleBackColor = False + ' 'btnSendungslisteUNISPED ' Me.btnSendungslisteUNISPED.BackColor = System.Drawing.Color.White @@ -706,10 +697,10 @@ Partial Class usrcntlAktDetails Me.btnSendungslisteUNISPED.ForeColor = System.Drawing.Color.Black Me.btnSendungslisteUNISPED.Image = Global.AVISO.My.Resources.Resources.spedbuch_small Me.btnSendungslisteUNISPED.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnSendungslisteUNISPED.Location = New System.Drawing.Point(8, 138) + Me.btnSendungslisteUNISPED.Location = New System.Drawing.Point(5, 112) Me.btnSendungslisteUNISPED.Margin = New System.Windows.Forms.Padding(0) Me.btnSendungslisteUNISPED.Name = "btnSendungslisteUNISPED" - Me.btnSendungslisteUNISPED.Size = New System.Drawing.Size(184, 54) + Me.btnSendungslisteUNISPED.Size = New System.Drawing.Size(123, 36) Me.btnSendungslisteUNISPED.TabIndex = 112 Me.btnSendungslisteUNISPED.Text = "Alle Sendungen" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "UNISPED" Me.btnSendungslisteUNISPED.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -722,10 +713,9 @@ Partial Class usrcntlAktDetails Me.cbxAlleFirmen.Checked = True Me.cbxAlleFirmen.CheckState = System.Windows.Forms.CheckState.Checked Me.cbxAlleFirmen.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxAlleFirmen.Location = New System.Drawing.Point(276, 8) - Me.cbxAlleFirmen.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cbxAlleFirmen.Location = New System.Drawing.Point(184, 5) Me.cbxAlleFirmen.Name = "cbxAlleFirmen" - Me.cbxAlleFirmen.Size = New System.Drawing.Size(112, 24) + Me.cbxAlleFirmen.Size = New System.Drawing.Size(76, 17) Me.cbxAlleFirmen.TabIndex = 111 Me.cbxAlleFirmen.Text = "alle Firmen" Me.cbxAlleFirmen.UseVisualStyleBackColor = True @@ -737,10 +727,10 @@ Partial Class usrcntlAktDetails Me.Button12.ForeColor = System.Drawing.Color.Black Me.Button12.Image = Global.AVISO.My.Resources.Resources.spedbuch_small Me.Button12.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button12.Location = New System.Drawing.Point(201, 138) + Me.Button12.Location = New System.Drawing.Point(134, 147) Me.Button12.Margin = New System.Windows.Forms.Padding(0) Me.Button12.Name = "Button12" - Me.Button12.Size = New System.Drawing.Size(192, 54) + Me.Button12.Size = New System.Drawing.Size(128, 36) Me.Button12.TabIndex = 110 Me.Button12.Text = "Alle Steuerbe-" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "scheide drucken" Me.Button12.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -753,10 +743,10 @@ Partial Class usrcntlAktDetails Me.Button11.ForeColor = System.Drawing.Color.Black Me.Button11.Image = Global.AVISO.My.Resources.Resources.spedbuch_small Me.Button11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button11.Location = New System.Drawing.Point(201, 86) + Me.Button11.Location = New System.Drawing.Point(134, 112) Me.Button11.Margin = New System.Windows.Forms.Padding(0) Me.Button11.Name = "Button11" - Me.Button11.Size = New System.Drawing.Size(192, 54) + Me.Button11.Size = New System.Drawing.Size(128, 36) Me.Button11.TabIndex = 109 Me.Button11.Text = "Alle Aktendeckel " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "drucken" Me.Button11.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -769,10 +759,10 @@ Partial Class usrcntlAktDetails Me.btnKasse_User.ForeColor = System.Drawing.Color.Black Me.btnKasse_User.Image = Global.AVISO.My.Resources.Resources.pdf11 Me.btnKasse_User.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnKasse_User.Location = New System.Drawing.Point(8, 33) + Me.btnKasse_User.Location = New System.Drawing.Point(5, 22) Me.btnKasse_User.Margin = New System.Windows.Forms.Padding(0) Me.btnKasse_User.Name = "btnKasse_User" - Me.btnKasse_User.Size = New System.Drawing.Size(184, 54) + Me.btnKasse_User.Size = New System.Drawing.Size(123, 36) Me.btnKasse_User.TabIndex = 4 Me.btnKasse_User.Text = "Dispoliste" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "alle Sendg." Me.btnKasse_User.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -784,19 +774,17 @@ Partial Class usrcntlAktDetails Me.cboFormulareRgAn._allowFreiText = False Me.cboFormulareRgAn._value = "" Me.cboFormulareRgAn.FormattingEnabled = True - Me.cboFormulareRgAn.Location = New System.Drawing.Point(60, 3) - Me.cboFormulareRgAn.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cboFormulareRgAn.Location = New System.Drawing.Point(40, 2) Me.cboFormulareRgAn.Name = "cboFormulareRgAn" - Me.cboFormulareRgAn.Size = New System.Drawing.Size(130, 28) + Me.cboFormulareRgAn.Size = New System.Drawing.Size(88, 21) Me.cboFormulareRgAn.TabIndex = 108 ' 'Label4 ' Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(4, 8) - Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label4.Location = New System.Drawing.Point(3, 5) Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(56, 20) + Me.Label4.Size = New System.Drawing.Size(39, 13) Me.Label4.TabIndex = 107 Me.Label4.Text = "Rg.an:" Me.Label4.TextAlign = System.Drawing.ContentAlignment.TopRight @@ -810,10 +798,9 @@ Partial Class usrcntlAktDetails Me.Button8.ForeColor = System.Drawing.Color.Black Me.Button8.Image = Global.AVISO.My.Resources.Resources.spedbuch_small Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button8.Location = New System.Drawing.Point(201, 213) - Me.Button8.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button8.Location = New System.Drawing.Point(134, 186) Me.Button8.Name = "Button8" - Me.Button8.Size = New System.Drawing.Size(189, 54) + Me.Button8.Size = New System.Drawing.Size(128, 36) Me.Button8.TabIndex = 106 Me.Button8.Text = "SA-Gest." Me.Button8.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -826,10 +813,10 @@ Partial Class usrcntlAktDetails Me.Button10.ForeColor = System.Drawing.Color.Black Me.Button10.Image = Global.AVISO.My.Resources.Resources.spedbuch_small Me.Button10.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button10.Location = New System.Drawing.Point(201, 33) + Me.Button10.Location = New System.Drawing.Point(134, 22) Me.Button10.Margin = New System.Windows.Forms.Padding(0) Me.Button10.Name = "Button10" - Me.Button10.Size = New System.Drawing.Size(192, 54) + Me.Button10.Size = New System.Drawing.Size(128, 36) Me.Button10.TabIndex = 6 Me.Button10.Text = "Laufzettel" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Zoll DE" Me.Button10.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -842,10 +829,10 @@ Partial Class usrcntlAktDetails Me.Button9.ForeColor = System.Drawing.Color.Black Me.Button9.Image = Global.AVISO.My.Resources.Resources.email_big1 Me.Button9.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button9.Location = New System.Drawing.Point(8, 86) + Me.Button9.Location = New System.Drawing.Point(5, 57) Me.Button9.Margin = New System.Windows.Forms.Padding(0) Me.Button9.Name = "Button9" - Me.Button9.Size = New System.Drawing.Size(184, 54) + Me.Button9.Size = New System.Drawing.Size(123, 36) Me.Button9.TabIndex = 5 Me.Button9.Text = "Dispoliste" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "alle Sendg." Me.Button9.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -858,24 +845,52 @@ Partial Class usrcntlAktDetails Me.btnKasse_LG.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.btnKasse_LG.ForeColor = System.Drawing.Color.Black Me.btnKasse_LG.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnKasse_LG.Location = New System.Drawing.Point(8, 213) + Me.btnKasse_LG.Location = New System.Drawing.Point(5, 186) Me.btnKasse_LG.Margin = New System.Windows.Forms.Padding(0) Me.btnKasse_LG.Name = "btnKasse_LG" - Me.btnKasse_LG.Size = New System.Drawing.Size(184, 54) + Me.btnKasse_LG.Size = New System.Drawing.Size(123, 36) Me.btnKasse_LG.TabIndex = 3 Me.btnKasse_LG.Text = "Dispo.Haft" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(nur T1/T2)" Me.btnKasse_LG.UseVisualStyleBackColor = False ' + 'cbxLZRg + ' + Me.cbxLZRg._value = "" + Me.cbxLZRg.AutoSize = True + Me.cbxLZRg.Checked = True + Me.cbxLZRg.Checked_value = False + Me.cbxLZRg.CheckedValue = False + Me.cbxLZRg.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbxLZRg.Location = New System.Drawing.Point(134, 93) + Me.cbxLZRg.Name = "cbxLZRg" + Me.cbxLZRg.Size = New System.Drawing.Size(88, 17) + Me.cbxLZRg.TabIndex = 115 + Me.cbxLZRg.Text = "Rechnungen" + Me.cbxLZRg.UseVisualStyleBackColor = True + ' + 'cbxLZT1 + ' + Me.cbxLZT1._value = "" + Me.cbxLZT1.AutoSize = True + Me.cbxLZT1.Checked_value = False + Me.cbxLZT1.CheckedValue = False + Me.cbxLZT1.Location = New System.Drawing.Point(223, 93) + Me.cbxLZT1.Name = "cbxLZT1" + Me.cbxLZT1.Size = New System.Drawing.Size(39, 17) + Me.cbxLZT1.TabIndex = 114 + Me.cbxLZT1.Text = "T1" + Me.cbxLZT1.UseVisualStyleBackColor = True + Me.cbxLZT1.Visible = False + ' 'Button18 ' Me.Button18.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Button18.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button18.Image = CType(resources.GetObject("Button18.Image"), System.Drawing.Image) Me.Button18.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button18.Location = New System.Drawing.Point(674, 224) - Me.Button18.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button18.Location = New System.Drawing.Point(446, 225) Me.Button18.Name = "Button18" - Me.Button18.Size = New System.Drawing.Size(194, 51) + Me.Button18.Size = New System.Drawing.Size(129, 34) Me.Button18.TabIndex = 103 Me.Button18.Text = "Import-Assistent ..." Me.Button18.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -909,8 +924,7 @@ Partial Class usrcntlAktDetails DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] Me.gridVermerke.DefaultCellStyle = DataGridViewCellStyle8 Me.gridVermerke.Dock = System.Windows.Forms.DockStyle.Fill - Me.gridVermerke.Location = New System.Drawing.Point(0, 45) - Me.gridVermerke.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.gridVermerke.Location = New System.Drawing.Point(0, 30) Me.gridVermerke.MultiSelect = False Me.gridVermerke.Name = "gridVermerke" Me.gridVermerke.ReadOnly = True @@ -932,7 +946,7 @@ Partial Class usrcntlAktDetails Me.gridVermerke.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.gridVermerke.ShowCellErrors = False Me.gridVermerke.ShowRowErrors = False - Me.gridVermerke.Size = New System.Drawing.Size(867, 189) + Me.gridVermerke.Size = New System.Drawing.Size(575, 204) Me.gridVermerke.TabIndex = 70 Me.gridVermerke.TabStop = False ' @@ -944,10 +958,9 @@ Partial Class usrcntlAktDetails Me.pnlVermerkeTop.Dock = System.Windows.Forms.DockStyle.Top Me.pnlVermerkeTop.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.pnlVermerkeTop.Location = New System.Drawing.Point(0, 0) - Me.pnlVermerkeTop.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.pnlVermerkeTop.Name = "pnlVermerkeTop" - Me.pnlVermerkeTop.Padding = New System.Windows.Forms.Padding(6, 0, 0, 0) - Me.pnlVermerkeTop.Size = New System.Drawing.Size(867, 45) + Me.pnlVermerkeTop.Padding = New System.Windows.Forms.Padding(4, 0, 0, 0) + Me.pnlVermerkeTop.Size = New System.Drawing.Size(575, 30) Me.pnlVermerkeTop.TabIndex = 72 ' 'Panel1 @@ -955,10 +968,9 @@ Partial Class usrcntlAktDetails Me.Panel1.Controls.Add(Me.Button6) Me.Panel1.Controls.Add(Me.btnFormulare) Me.Panel1.Dock = System.Windows.Forms.DockStyle.Right - Me.Panel1.Location = New System.Drawing.Point(455, 0) - Me.Panel1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Panel1.Location = New System.Drawing.Point(300, 0) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(412, 45) + Me.Panel1.Size = New System.Drawing.Size(275, 30) Me.Panel1.TabIndex = 104 ' 'Button6 @@ -969,10 +981,9 @@ Partial Class usrcntlAktDetails Me.Button6.ForeColor = System.Drawing.Color.Black Me.Button6.Image = Global.AVISO.My.Resources.Resources.spedbuch_small Me.Button6.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button6.Location = New System.Drawing.Point(252, 3) - Me.Button6.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button6.Location = New System.Drawing.Point(168, 2) Me.Button6.Name = "Button6" - Me.Button6.Size = New System.Drawing.Size(159, 38) + Me.Button6.Size = New System.Drawing.Size(106, 25) Me.Button6.TabIndex = 105 Me.Button6.Text = "Verpfl.Fahrer" Me.Button6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -986,10 +997,9 @@ Partial Class usrcntlAktDetails Me.btnFormulare.ForeColor = System.Drawing.Color.Black Me.btnFormulare.Image = Global.AVISO.My.Resources.Resources.spedbuch_small Me.btnFormulare.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnFormulare.Location = New System.Drawing.Point(68, 3) - Me.btnFormulare.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.btnFormulare.Location = New System.Drawing.Point(45, 2) Me.btnFormulare.Name = "btnFormulare" - Me.btnFormulare.Size = New System.Drawing.Size(186, 38) + Me.btnFormulare.Size = New System.Drawing.Size(124, 25) Me.btnFormulare.TabIndex = 104 Me.btnFormulare.Text = "Formulare" Me.btnFormulare.TextAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -999,10 +1009,9 @@ Partial Class usrcntlAktDetails ' Me.pnlVermLeft.AutoSize = True Me.pnlVermLeft.Dock = System.Windows.Forms.DockStyle.Left - Me.pnlVermLeft.Location = New System.Drawing.Point(6, 0) - Me.pnlVermLeft.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.pnlVermLeft.Location = New System.Drawing.Point(4, 0) Me.pnlVermLeft.Name = "pnlVermLeft" - Me.pnlVermLeft.Size = New System.Drawing.Size(0, 45) + Me.pnlVermLeft.Size = New System.Drawing.Size(0, 30) Me.pnlVermLeft.TabIndex = 102 ' 'tbcntlVermerke @@ -1013,53 +1022,48 @@ Partial Class usrcntlAktDetails Me.tbcntlVermerke.Controls.Add(Me.tbAnhang) Me.tbcntlVermerke.Dock = System.Windows.Forms.DockStyle.Fill Me.tbcntlVermerke.ImeMode = System.Windows.Forms.ImeMode.Disable - Me.tbcntlVermerke.Location = New System.Drawing.Point(6, 0) - Me.tbcntlVermerke.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbcntlVermerke.Location = New System.Drawing.Point(4, 0) Me.tbcntlVermerke.Name = "tbcntlVermerke" Me.tbcntlVermerke.Padding = New System.Drawing.Point(6, 7) Me.tbcntlVermerke.SelectedIndex = 0 - Me.tbcntlVermerke.Size = New System.Drawing.Size(861, 45) + Me.tbcntlVermerke.Size = New System.Drawing.Size(571, 30) Me.tbcntlVermerke.TabIndex = 71 ' 'TabPage1 ' - Me.TabPage1.Location = New System.Drawing.Point(4, 37) - Me.TabPage1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.TabPage1.Location = New System.Drawing.Point(4, 30) Me.TabPage1.Name = "TabPage1" - Me.TabPage1.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.TabPage1.Size = New System.Drawing.Size(853, 4) + Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) + Me.TabPage1.Size = New System.Drawing.Size(563, 0) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Alle" Me.TabPage1.UseVisualStyleBackColor = True ' 'TabPage2 ' - Me.TabPage2.Location = New System.Drawing.Point(4, 37) - Me.TabPage2.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.TabPage2.Location = New System.Drawing.Point(4, 30) Me.TabPage2.Name = "TabPage2" - Me.TabPage2.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.TabPage2.Size = New System.Drawing.Size(931, 4) + Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) + Me.TabPage2.Size = New System.Drawing.Size(563, 0) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Aktenvermerke" Me.TabPage2.UseVisualStyleBackColor = True ' 'TabPage3 ' - Me.TabPage3.Location = New System.Drawing.Point(4, 37) - Me.TabPage3.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.TabPage3.Location = New System.Drawing.Point(4, 30) Me.TabPage3.Name = "TabPage3" - Me.TabPage3.Size = New System.Drawing.Size(931, 4) + Me.TabPage3.Size = New System.Drawing.Size(563, 0) Me.TabPage3.TabIndex = 2 Me.TabPage3.Text = "Sendungsvermerke" Me.TabPage3.UseVisualStyleBackColor = True ' 'tbAnhang ' - Me.tbAnhang.Location = New System.Drawing.Point(4, 37) - Me.tbAnhang.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbAnhang.Location = New System.Drawing.Point(4, 30) Me.tbAnhang.Name = "tbAnhang" - Me.tbAnhang.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.tbAnhang.Size = New System.Drawing.Size(931, 4) + Me.tbAnhang.Padding = New System.Windows.Forms.Padding(3) + Me.tbAnhang.Size = New System.Drawing.Size(563, 0) Me.tbAnhang.TabIndex = 3 Me.tbAnhang.Text = "Anhang" Me.tbAnhang.UseVisualStyleBackColor = True @@ -1072,10 +1076,9 @@ Partial Class usrcntlAktDetails Me.addVermerk.ForeColor = System.Drawing.Color.Black Me.addVermerk.Image = CType(resources.GetObject("addVermerk.Image"), System.Drawing.Image) Me.addVermerk.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.addVermerk.Location = New System.Drawing.Point(662, 0) - Me.addVermerk.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.addVermerk.Location = New System.Drawing.Point(438, 0) Me.addVermerk.Name = "addVermerk" - Me.addVermerk.Size = New System.Drawing.Size(201, 60) + Me.addVermerk.Size = New System.Drawing.Size(134, 40) Me.addVermerk.TabIndex = 101 Me.addVermerk.Text = "Neuer Vermerk" Me.addVermerk.TextAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -1092,19 +1095,17 @@ Partial Class usrcntlAktDetails Me.pnlMAInfo.Controls.Add(Me.txtMAinfo_VorbereitetQs) Me.pnlMAInfo.Dock = System.Windows.Forms.DockStyle.Bottom Me.pnlMAInfo.Location = New System.Drawing.Point(0, 234) - Me.pnlMAInfo.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.pnlMAInfo.Name = "pnlMAInfo" - Me.pnlMAInfo.Size = New System.Drawing.Size(867, 42) + Me.pnlMAInfo.Size = New System.Drawing.Size(575, 28) Me.pnlMAInfo.TabIndex = 106 ' 'picMAinfo_AbklaerungTR ' Me.picMAinfo_AbklaerungTR.BackgroundImage = Global.AVISO.My.Resources.Resources.abklaerungTR_Inaktiv Me.picMAinfo_AbklaerungTR.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.picMAinfo_AbklaerungTR.Location = New System.Drawing.Point(54, 6) - Me.picMAinfo_AbklaerungTR.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.picMAinfo_AbklaerungTR.Location = New System.Drawing.Point(36, 4) Me.picMAinfo_AbklaerungTR.Name = "picMAinfo_AbklaerungTR" - Me.picMAinfo_AbklaerungTR.Size = New System.Drawing.Size(39, 32) + Me.picMAinfo_AbklaerungTR.Size = New System.Drawing.Size(26, 21) Me.picMAinfo_AbklaerungTR.TabIndex = 109 Me.picMAinfo_AbklaerungTR.TabStop = False ' @@ -1112,10 +1113,9 @@ Partial Class usrcntlAktDetails ' Me.picMAinfo_Vorgeschrieben.BackgroundImage = Global.AVISO.My.Resources.Resources.statusBtn_vorgeschrieben_InAktiv Me.picMAinfo_Vorgeschrieben.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.picMAinfo_Vorgeschrieben.Location = New System.Drawing.Point(456, 6) - Me.picMAinfo_Vorgeschrieben.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.picMAinfo_Vorgeschrieben.Location = New System.Drawing.Point(304, 4) Me.picMAinfo_Vorgeschrieben.Name = "picMAinfo_Vorgeschrieben" - Me.picMAinfo_Vorgeschrieben.Size = New System.Drawing.Size(39, 32) + Me.picMAinfo_Vorgeschrieben.Size = New System.Drawing.Size(26, 21) Me.picMAinfo_Vorgeschrieben.TabIndex = 107 Me.picMAinfo_Vorgeschrieben.TabStop = False ' @@ -1123,10 +1123,9 @@ Partial Class usrcntlAktDetails ' Me.picMAinfo_VorbereitetQs.BackgroundImage = Global.AVISO.My.Resources.Resources.statusBtn_vorbereitet_InAktiv Me.picMAinfo_VorbereitetQs.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.picMAinfo_VorbereitetQs.Location = New System.Drawing.Point(240, 6) - Me.picMAinfo_VorbereitetQs.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.picMAinfo_VorbereitetQs.Location = New System.Drawing.Point(160, 4) Me.picMAinfo_VorbereitetQs.Name = "picMAinfo_VorbereitetQs" - Me.picMAinfo_VorbereitetQs.Size = New System.Drawing.Size(39, 32) + Me.picMAinfo_VorbereitetQs.Size = New System.Drawing.Size(26, 21) Me.picMAinfo_VorbereitetQs.TabIndex = 0 Me.picMAinfo_VorbereitetQs.TabStop = False ' @@ -1137,12 +1136,11 @@ Partial Class usrcntlAktDetails Me.txtMAinfo_AbklaerungTR.Cursor = System.Windows.Forms.Cursors.Hand Me.txtMAinfo_AbklaerungTR.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold) Me.txtMAinfo_AbklaerungTR.ForeColor = System.Drawing.Color.Black - Me.txtMAinfo_AbklaerungTR.Location = New System.Drawing.Point(102, 9) - Me.txtMAinfo_AbklaerungTR.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.txtMAinfo_AbklaerungTR.Location = New System.Drawing.Point(68, 6) Me.txtMAinfo_AbklaerungTR.MaxLength = 0 Me.txtMAinfo_AbklaerungTR.Name = "txtMAinfo_AbklaerungTR" Me.txtMAinfo_AbklaerungTR.ReadOnly = True - Me.txtMAinfo_AbklaerungTR.Size = New System.Drawing.Size(135, 21) + Me.txtMAinfo_AbklaerungTR.Size = New System.Drawing.Size(90, 14) Me.txtMAinfo_AbklaerungTR.TabIndex = 110 Me.txtMAinfo_AbklaerungTR.TabStop = False Me.txtMAinfo_AbklaerungTR.Text = "-" @@ -1154,12 +1152,11 @@ Partial Class usrcntlAktDetails Me.txtMAinfo_Vorgeschrieben.Cursor = System.Windows.Forms.Cursors.Hand Me.txtMAinfo_Vorgeschrieben.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold) Me.txtMAinfo_Vorgeschrieben.ForeColor = System.Drawing.Color.Black - Me.txtMAinfo_Vorgeschrieben.Location = New System.Drawing.Point(504, 9) - Me.txtMAinfo_Vorgeschrieben.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.txtMAinfo_Vorgeschrieben.Location = New System.Drawing.Point(336, 6) Me.txtMAinfo_Vorgeschrieben.MaxLength = 0 Me.txtMAinfo_Vorgeschrieben.Name = "txtMAinfo_Vorgeschrieben" Me.txtMAinfo_Vorgeschrieben.ReadOnly = True - Me.txtMAinfo_Vorgeschrieben.Size = New System.Drawing.Size(158, 21) + Me.txtMAinfo_Vorgeschrieben.Size = New System.Drawing.Size(105, 14) Me.txtMAinfo_Vorgeschrieben.TabIndex = 108 Me.txtMAinfo_Vorgeschrieben.TabStop = False Me.txtMAinfo_Vorgeschrieben.Text = "-" @@ -1171,12 +1168,11 @@ Partial Class usrcntlAktDetails Me.txtMAinfo_VorbereitetQs.Cursor = System.Windows.Forms.Cursors.Hand Me.txtMAinfo_VorbereitetQs.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold) Me.txtMAinfo_VorbereitetQs.ForeColor = System.Drawing.Color.Black - Me.txtMAinfo_VorbereitetQs.Location = New System.Drawing.Point(288, 9) - Me.txtMAinfo_VorbereitetQs.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.txtMAinfo_VorbereitetQs.Location = New System.Drawing.Point(192, 6) Me.txtMAinfo_VorbereitetQs.MaxLength = 0 Me.txtMAinfo_VorbereitetQs.Name = "txtMAinfo_VorbereitetQs" Me.txtMAinfo_VorbereitetQs.ReadOnly = True - Me.txtMAinfo_VorbereitetQs.Size = New System.Drawing.Size(158, 21) + Me.txtMAinfo_VorbereitetQs.Size = New System.Drawing.Size(105, 14) Me.txtMAinfo_VorbereitetQs.TabIndex = 106 Me.txtMAinfo_VorbereitetQs.TabStop = False Me.txtMAinfo_VorbereitetQs.Text = "-" @@ -1206,9 +1202,8 @@ Partial Class usrcntlAktDetails Me.Panel8.Controls.Add(Me.lblAktUebernommen) Me.Panel8.Dock = System.Windows.Forms.DockStyle.Top Me.Panel8.Location = New System.Drawing.Point(0, 0) - Me.Panel8.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.Panel8.Name = "Panel8" - Me.Panel8.Size = New System.Drawing.Size(867, 179) + Me.Panel8.Size = New System.Drawing.Size(575, 120) Me.Panel8.TabIndex = 92 ' 'lblBarZuKassierenSumme @@ -1216,10 +1211,9 @@ Partial Class usrcntlAktDetails Me.lblBarZuKassierenSumme.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblBarZuKassierenSumme.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblBarZuKassierenSumme.ForeColor = System.Drawing.Color.Red - Me.lblBarZuKassierenSumme.Location = New System.Drawing.Point(661, 114) - Me.lblBarZuKassierenSumme.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblBarZuKassierenSumme.Location = New System.Drawing.Point(437, 76) Me.lblBarZuKassierenSumme.Name = "lblBarZuKassierenSumme" - Me.lblBarZuKassierenSumme.Size = New System.Drawing.Size(206, 28) + Me.lblBarZuKassierenSumme.Size = New System.Drawing.Size(137, 19) Me.lblBarZuKassierenSumme.TabIndex = 109 Me.lblBarZuKassierenSumme.Text = "BAR: € 150,00" Me.lblBarZuKassierenSumme.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -1233,10 +1227,9 @@ Partial Class usrcntlAktDetails Me.Button4.ForeColor = System.Drawing.Color.Black Me.Button4.Image = Global.AVISO.My.Resources.Resources.personCheck_small Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button4.Location = New System.Drawing.Point(6, 117) - Me.Button4.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button4.Location = New System.Drawing.Point(4, 78) Me.Button4.Name = "Button4" - Me.Button4.Size = New System.Drawing.Size(243, 52) + Me.Button4.Size = New System.Drawing.Size(162, 35) Me.Button4.TabIndex = 101 Me.Button4.Text = "Akt übernehmen" Me.Button4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -1250,10 +1243,9 @@ Partial Class usrcntlAktDetails Me.Button7.ForeColor = System.Drawing.Color.Black Me.Button7.Image = Global.AVISO.My.Resources.Resources.handy1 Me.Button7.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button7.Location = New System.Drawing.Point(567, 0) - Me.Button7.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button7.Location = New System.Drawing.Point(375, 0) Me.Button7.Name = "Button7" - Me.Button7.Size = New System.Drawing.Size(94, 54) + Me.Button7.Size = New System.Drawing.Size(63, 36) Me.Button7.TabIndex = 107 Me.Button7.Text = "SMS" Me.Button7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -1268,10 +1260,10 @@ Partial Class usrcntlAktDetails Me.btnLkwBeleg.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnLkwBeleg.ForeColor = System.Drawing.Color.Black Me.btnLkwBeleg.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnLkwBeleg.Location = New System.Drawing.Point(567, 52) + Me.btnLkwBeleg.Location = New System.Drawing.Point(375, 35) Me.btnLkwBeleg.Margin = New System.Windows.Forms.Padding(0) Me.btnLkwBeleg.Name = "btnLkwBeleg" - Me.btnLkwBeleg.Size = New System.Drawing.Size(94, 60) + Me.btnLkwBeleg.Size = New System.Drawing.Size(63, 40) Me.btnLkwBeleg.TabIndex = 106 Me.btnLkwBeleg.Text = "BAR" Me.btnLkwBeleg.UseVisualStyleBackColor = False @@ -1281,10 +1273,9 @@ Partial Class usrcntlAktDetails Me.Label1.AutoSize = True Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label1.ForeColor = System.Drawing.Color.Black - Me.Label1.Location = New System.Drawing.Point(3, 14) - Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label1.Location = New System.Drawing.Point(2, 9) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(86, 25) + Me.Label1.Size = New System.Drawing.Size(58, 17) Me.Label1.TabIndex = 104 Me.Label1.Text = "LKW-Id:" ' @@ -1295,10 +1286,9 @@ Partial Class usrcntlAktDetails Me.btnFertig.ForeColor = System.Drawing.Color.Black Me.btnFertig.Image = CType(resources.GetObject("btnFertig.Image"), System.Drawing.Image) Me.btnFertig.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnFertig.Location = New System.Drawing.Point(659, 52) - Me.btnFertig.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.btnFertig.Location = New System.Drawing.Point(436, 35) Me.btnFertig.Name = "btnFertig" - Me.btnFertig.Size = New System.Drawing.Size(201, 60) + Me.btnFertig.Size = New System.Drawing.Size(134, 40) Me.btnFertig.TabIndex = 99 Me.btnFertig.Text = "LKW fertig" Me.btnFertig.TextAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -1310,10 +1300,9 @@ Partial Class usrcntlAktDetails Me.lblIMEX.BackColor = System.Drawing.SystemColors.WindowFrame Me.lblIMEX.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.0!, System.Drawing.FontStyle.Bold) Me.lblIMEX.ForeColor = System.Drawing.Color.White - Me.lblIMEX.Location = New System.Drawing.Point(281, 14) - Me.lblIMEX.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblIMEX.Location = New System.Drawing.Point(184, 9) Me.lblIMEX.Name = "lblIMEX" - Me.lblIMEX.Size = New System.Drawing.Size(129, 30) + Me.lblIMEX.Size = New System.Drawing.Size(86, 20) Me.lblIMEX.TabIndex = 98 Me.lblIMEX.Text = "IMPORT" Me.lblIMEX.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -1325,10 +1314,9 @@ Partial Class usrcntlAktDetails Me.cbxHandling.BackColor = System.Drawing.SystemColors.WindowFrame Me.cbxHandling.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.0!, System.Drawing.FontStyle.Bold) Me.cbxHandling.ForeColor = System.Drawing.Color.White - Me.cbxHandling.Location = New System.Drawing.Point(415, 14) - Me.cbxHandling.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.cbxHandling.Location = New System.Drawing.Point(273, 9) Me.cbxHandling.Name = "cbxHandling" - Me.cbxHandling.Size = New System.Drawing.Size(147, 30) + Me.cbxHandling.Size = New System.Drawing.Size(98, 20) Me.cbxHandling.TabIndex = 99 Me.cbxHandling.Text = "HANDLING" Me.cbxHandling.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -1344,10 +1332,10 @@ Partial Class usrcntlAktDetails Me.btnAktAbschliessen.ForeColor = System.Drawing.Color.White Me.btnAktAbschliessen.Image = Global.AVISO.My.Resources.Resources.ok Me.btnAktAbschliessen.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnAktAbschliessen.Location = New System.Drawing.Point(659, 105) + Me.btnAktAbschliessen.Location = New System.Drawing.Point(436, 70) Me.btnAktAbschliessen.Margin = New System.Windows.Forms.Padding(0) Me.btnAktAbschliessen.Name = "btnAktAbschliessen" - Me.btnAktAbschliessen.Size = New System.Drawing.Size(201, 68) + Me.btnAktAbschliessen.Size = New System.Drawing.Size(134, 45) Me.btnAktAbschliessen.TabIndex = 98 Me.btnAktAbschliessen.Text = "Akt " & Global.Microsoft.VisualBasic.ChrW(10) & "abschließen" Me.btnAktAbschliessen.TextAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -1362,10 +1350,9 @@ Partial Class usrcntlAktDetails Me.Button2.ForeColor = System.Drawing.Color.Black Me.Button2.Image = Global.AVISO.My.Resources.Resources.gear2 Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button2.Location = New System.Drawing.Point(659, 0) - Me.Button2.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button2.Location = New System.Drawing.Point(436, 0) Me.Button2.Name = "Button2" - Me.Button2.Size = New System.Drawing.Size(201, 54) + Me.Button2.Size = New System.Drawing.Size(134, 36) Me.Button2.TabIndex = 94 Me.Button2.Text = "Optionen " Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -1379,12 +1366,11 @@ Partial Class usrcntlAktDetails Me.txtAktMA.BorderStyle = System.Windows.Forms.BorderStyle.None Me.txtAktMA.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtAktMA.ForeColor = System.Drawing.Color.Black - Me.txtAktMA.Location = New System.Drawing.Point(258, 144) - Me.txtAktMA.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.txtAktMA.Location = New System.Drawing.Point(172, 96) Me.txtAktMA.MaxLength = 0 Me.txtAktMA.Name = "txtAktMA" Me.txtAktMA.ReadOnly = True - Me.txtAktMA.Size = New System.Drawing.Size(376, 23) + Me.txtAktMA.Size = New System.Drawing.Size(247, 16) Me.txtAktMA.TabIndex = 97 Me.txtAktMA.TabStop = False ' @@ -1393,10 +1379,9 @@ Partial Class usrcntlAktDetails Me.Label3.AutoSize = True Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label3.ForeColor = System.Drawing.Color.Black - Me.Label3.Location = New System.Drawing.Point(254, 114) - Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label3.Location = New System.Drawing.Point(169, 76) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(85, 25) + Me.Label3.Size = New System.Drawing.Size(59, 17) Me.Label3.TabIndex = 96 Me.Label3.Text = "akt. MA:" ' @@ -1405,10 +1390,9 @@ Partial Class usrcntlAktDetails Me.Label10.AutoSize = True Me.Label10.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label10.ForeColor = System.Drawing.Color.Black - Me.Label10.Location = New System.Drawing.Point(3, 46) - Me.Label10.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label10.Location = New System.Drawing.Point(2, 31) Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(90, 25) + Me.Label10.Size = New System.Drawing.Size(65, 17) Me.Label10.TabIndex = 84 Me.Label10.Text = "Frächter:" ' @@ -1417,10 +1401,9 @@ Partial Class usrcntlAktDetails Me.Label9.AutoSize = True Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label9.ForeColor = System.Drawing.Color.Black - Me.Label9.Location = New System.Drawing.Point(3, 82) - Me.Label9.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label9.Location = New System.Drawing.Point(2, 55) Me.Label9.Name = "Label9" - Me.Label9.Size = New System.Drawing.Size(94, 25) + Me.Label9.Size = New System.Drawing.Size(67, 17) Me.Label9.TabIndex = 88 Me.Label9.Text = "Avisierer:" ' @@ -1432,12 +1415,11 @@ Partial Class usrcntlAktDetails Me.txtFrächter.BorderStyle = System.Windows.Forms.BorderStyle.None Me.txtFrächter.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtFrächter.ForeColor = System.Drawing.Color.Black - Me.txtFrächter.Location = New System.Drawing.Point(112, 46) - Me.txtFrächter.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.txtFrächter.Location = New System.Drawing.Point(75, 31) Me.txtFrächter.MaxLength = 0 Me.txtFrächter.Name = "txtFrächter" Me.txtFrächter.ReadOnly = True - Me.txtFrächter.Size = New System.Drawing.Size(544, 23) + Me.txtFrächter.Size = New System.Drawing.Size(359, 16) Me.txtFrächter.TabIndex = 85 Me.txtFrächter.TabStop = False ' @@ -1449,12 +1431,11 @@ Partial Class usrcntlAktDetails Me.txtAuftraggeber.BorderStyle = System.Windows.Forms.BorderStyle.None Me.txtAuftraggeber.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtAuftraggeber.ForeColor = System.Drawing.Color.Black - Me.txtAuftraggeber.Location = New System.Drawing.Point(112, 82) - Me.txtAuftraggeber.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.txtAuftraggeber.Location = New System.Drawing.Point(75, 55) Me.txtAuftraggeber.MaxLength = 0 Me.txtAuftraggeber.Name = "txtAuftraggeber" Me.txtAuftraggeber.ReadOnly = True - Me.txtAuftraggeber.Size = New System.Drawing.Size(544, 23) + Me.txtAuftraggeber.Size = New System.Drawing.Size(359, 16) Me.txtAuftraggeber.TabIndex = 89 Me.txtAuftraggeber.TabStop = False ' @@ -1463,10 +1444,9 @@ Partial Class usrcntlAktDetails Me.pnlAbgeschlossen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.pnlAbgeschlossen.Controls.Add(Me.Label2) Me.pnlAbgeschlossen.Controls.Add(Me.pic) - Me.pnlAbgeschlossen.Location = New System.Drawing.Point(625, 112) - Me.pnlAbgeschlossen.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.pnlAbgeschlossen.Location = New System.Drawing.Point(413, 75) Me.pnlAbgeschlossen.Name = "pnlAbgeschlossen" - Me.pnlAbgeschlossen.Size = New System.Drawing.Size(236, 66) + Me.pnlAbgeschlossen.Size = New System.Drawing.Size(157, 44) Me.pnlAbgeschlossen.TabIndex = 103 Me.pnlAbgeschlossen.Visible = False ' @@ -1476,10 +1456,9 @@ Partial Class usrcntlAktDetails Me.Label2.Cursor = System.Windows.Forms.Cursors.Hand Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label2.ForeColor = System.Drawing.Color.Green - Me.Label2.Location = New System.Drawing.Point(58, 21) - Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label2.Location = New System.Drawing.Point(39, 14) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(160, 25) + Me.Label2.Size = New System.Drawing.Size(117, 17) Me.Label2.TabIndex = 105 Me.Label2.Text = "Abgeschlossen" ' @@ -1487,10 +1466,9 @@ Partial Class usrcntlAktDetails ' Me.pic.BackgroundImage = Global.AVISO.My.Resources.Resources.ok Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.pic.Location = New System.Drawing.Point(0, 14) - Me.pic.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.pic.Location = New System.Drawing.Point(0, 9) Me.pic.Name = "pic" - Me.pic.Size = New System.Drawing.Size(57, 40) + Me.pic.Size = New System.Drawing.Size(38, 27) Me.pic.TabIndex = 0 Me.pic.TabStop = False ' @@ -1499,10 +1477,9 @@ Partial Class usrcntlAktDetails Me.lklAuswahlAufheben.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lklAuswahlAufheben.AutoSize = True Me.lklAuswahlAufheben.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.lklAuswahlAufheben.Location = New System.Drawing.Point(707, 150) - Me.lklAuswahlAufheben.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lklAuswahlAufheben.Location = New System.Drawing.Point(468, 100) Me.lklAuswahlAufheben.Name = "lklAuswahlAufheben" - Me.lklAuswahlAufheben.Size = New System.Drawing.Size(141, 20) + Me.lklAuswahlAufheben.Size = New System.Drawing.Size(95, 13) Me.lklAuswahlAufheben.TabIndex = 93 Me.lklAuswahlAufheben.TabStop = True Me.lklAuswahlAufheben.Text = "Auswahl aufheben" @@ -1515,12 +1492,11 @@ Partial Class usrcntlAktDetails Me.txtLKWID.BorderStyle = System.Windows.Forms.BorderStyle.None Me.txtLKWID.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtLKWID.ForeColor = System.Drawing.Color.Black - Me.txtLKWID.Location = New System.Drawing.Point(112, 15) - Me.txtLKWID.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.txtLKWID.Location = New System.Drawing.Point(75, 10) Me.txtLKWID.MaxLength = 0 Me.txtLKWID.Name = "txtLKWID" Me.txtLKWID.ReadOnly = True - Me.txtLKWID.Size = New System.Drawing.Size(544, 23) + Me.txtLKWID.Size = New System.Drawing.Size(359, 16) Me.txtLKWID.TabIndex = 105 Me.txtLKWID.TabStop = False Me.txtLKWID.Text = "000000" @@ -1531,10 +1507,9 @@ Partial Class usrcntlAktDetails Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAktUebernommen.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAktUebernommen.ForeColor = System.Drawing.Color.Green - Me.lblAktUebernommen.Location = New System.Drawing.Point(249, 112) - Me.lblAktUebernommen.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblAktUebernommen.Location = New System.Drawing.Point(166, 75) Me.lblAktUebernommen.Name = "lblAktUebernommen" - Me.lblAktUebernommen.Size = New System.Drawing.Size(367, 57) + Me.lblAktUebernommen.Size = New System.Drawing.Size(241, 38) Me.lblAktUebernommen.TabIndex = 102 Me.lblAktUebernommen.Text = "Akt übernommen!" Me.lblAktUebernommen.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -1550,10 +1525,9 @@ Partial Class usrcntlAktDetails Me.FlowLayoutPanel.Controls.Add(Me.Panel12) Me.FlowLayoutPanel.Controls.Add(Me.Panel2) Me.FlowLayoutPanel.Dock = System.Windows.Forms.DockStyle.Top - Me.FlowLayoutPanel.Location = New System.Drawing.Point(0, 54) - Me.FlowLayoutPanel.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.FlowLayoutPanel.Location = New System.Drawing.Point(0, 36) Me.FlowLayoutPanel.Name = "FlowLayoutPanel" - Me.FlowLayoutPanel.Size = New System.Drawing.Size(867, 88) + Me.FlowLayoutPanel.Size = New System.Drawing.Size(575, 69) Me.FlowLayoutPanel.TabIndex = 13 ' 'Panel9 @@ -1561,10 +1535,10 @@ Partial Class usrcntlAktDetails Me.Panel9.AutoSize = True Me.Panel9.Controls.Add(Me.btnErfasst) Me.Panel9.Controls.Add(Me.lblTimeErfasst) - Me.Panel9.Location = New System.Drawing.Point(3, 3) - Me.Panel9.Margin = New System.Windows.Forms.Padding(3, 3, 2, 3) + Me.Panel9.Location = New System.Drawing.Point(2, 2) + Me.Panel9.Margin = New System.Windows.Forms.Padding(2, 2, 1, 2) Me.Panel9.Name = "Panel9" - Me.Panel9.Size = New System.Drawing.Size(150, 80) + Me.Panel9.Size = New System.Drawing.Size(100, 58) Me.Panel9.TabIndex = 15 ' 'btnErfasst @@ -1579,9 +1553,9 @@ Partial Class usrcntlAktDetails Me.btnErfasst.ForeColor = System.Drawing.Color.White Me.btnErfasst.Location = New System.Drawing.Point(0, 0) Me.btnErfasst.Margin = New System.Windows.Forms.Padding(0) - Me.btnErfasst.MinimumSize = New System.Drawing.Size(150, 0) + Me.btnErfasst.MinimumSize = New System.Drawing.Size(100, 0) Me.btnErfasst.Name = "btnErfasst" - Me.btnErfasst.Size = New System.Drawing.Size(150, 62) + Me.btnErfasst.Size = New System.Drawing.Size(100, 46) Me.btnErfasst.TabIndex = 12 Me.btnErfasst.Text = "1. " & Global.Microsoft.VisualBasic.ChrW(10) & "ERFASST" Me.btnErfasst.UseVisualStyleBackColor = False @@ -1590,10 +1564,9 @@ Partial Class usrcntlAktDetails ' Me.lblTimeErfasst.Dock = System.Windows.Forms.DockStyle.Bottom Me.lblTimeErfasst.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblTimeErfasst.Location = New System.Drawing.Point(0, 62) - Me.lblTimeErfasst.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblTimeErfasst.Location = New System.Drawing.Point(0, 46) Me.lblTimeErfasst.Name = "lblTimeErfasst" - Me.lblTimeErfasst.Size = New System.Drawing.Size(150, 18) + Me.lblTimeErfasst.Size = New System.Drawing.Size(100, 12) Me.lblTimeErfasst.TabIndex = 0 Me.lblTimeErfasst.Text = "-" Me.lblTimeErfasst.TextAlign = System.Drawing.ContentAlignment.TopCenter @@ -1603,10 +1576,10 @@ Partial Class usrcntlAktDetails Me.Panel10.AutoSize = True Me.Panel10.Controls.Add(Me.btnVorbereitet) Me.Panel10.Controls.Add(Me.lblTimeVorbereitet) - Me.Panel10.Location = New System.Drawing.Point(157, 3) - Me.Panel10.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.Panel10.Location = New System.Drawing.Point(104, 2) + Me.Panel10.Margin = New System.Windows.Forms.Padding(1, 2, 1, 2) Me.Panel10.Name = "Panel10" - Me.Panel10.Size = New System.Drawing.Size(207, 82) + Me.Panel10.Size = New System.Drawing.Size(147, 59) Me.Panel10.TabIndex = 16 ' 'btnVorbereitet @@ -1621,9 +1594,9 @@ Partial Class usrcntlAktDetails Me.btnVorbereitet.ForeColor = System.Drawing.Color.White Me.btnVorbereitet.Location = New System.Drawing.Point(0, 0) Me.btnVorbereitet.Margin = New System.Windows.Forms.Padding(0) - Me.btnVorbereitet.MinimumSize = New System.Drawing.Size(150, 0) + Me.btnVorbereitet.MinimumSize = New System.Drawing.Size(100, 0) Me.btnVorbereitet.Name = "btnVorbereitet" - Me.btnVorbereitet.Size = New System.Drawing.Size(207, 62) + Me.btnVorbereitet.Size = New System.Drawing.Size(147, 46) Me.btnVorbereitet.TabIndex = 13 Me.btnVorbereitet.Text = "2." & Global.Microsoft.VisualBasic.ChrW(10) & "VORBEREITET(QS)" Me.btnVorbereitet.UseVisualStyleBackColor = False @@ -1632,10 +1605,9 @@ Partial Class usrcntlAktDetails ' Me.lblTimeVorbereitet.Dock = System.Windows.Forms.DockStyle.Bottom Me.lblTimeVorbereitet.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblTimeVorbereitet.Location = New System.Drawing.Point(0, 62) - Me.lblTimeVorbereitet.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblTimeVorbereitet.Location = New System.Drawing.Point(0, 46) Me.lblTimeVorbereitet.Name = "lblTimeVorbereitet" - Me.lblTimeVorbereitet.Size = New System.Drawing.Size(207, 20) + Me.lblTimeVorbereitet.Size = New System.Drawing.Size(147, 13) Me.lblTimeVorbereitet.TabIndex = 0 Me.lblTimeVorbereitet.Text = "-" Me.lblTimeVorbereitet.TextAlign = System.Drawing.ContentAlignment.TopCenter @@ -1645,10 +1617,10 @@ Partial Class usrcntlAktDetails Me.Panel13.AutoSize = True Me.Panel13.Controls.Add(Me.btnVorgeschrieben) Me.Panel13.Controls.Add(Me.lblTimeVorgeschreiben) - Me.Panel13.Location = New System.Drawing.Point(368, 3) - Me.Panel13.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.Panel13.Location = New System.Drawing.Point(253, 2) + Me.Panel13.Margin = New System.Windows.Forms.Padding(1, 2, 1, 2) Me.Panel13.Name = "Panel13" - Me.Panel13.Size = New System.Drawing.Size(156, 82) + Me.Panel13.Size = New System.Drawing.Size(112, 59) Me.Panel13.TabIndex = 17 ' 'btnVorgeschrieben @@ -1663,9 +1635,9 @@ Partial Class usrcntlAktDetails Me.btnVorgeschrieben.ForeColor = System.Drawing.Color.White Me.btnVorgeschrieben.Location = New System.Drawing.Point(0, 0) Me.btnVorgeschrieben.Margin = New System.Windows.Forms.Padding(0) - Me.btnVorgeschrieben.MinimumSize = New System.Drawing.Size(150, 0) + Me.btnVorgeschrieben.MinimumSize = New System.Drawing.Size(100, 0) Me.btnVorgeschrieben.Name = "btnVorgeschrieben" - Me.btnVorgeschrieben.Size = New System.Drawing.Size(156, 62) + Me.btnVorgeschrieben.Size = New System.Drawing.Size(112, 46) Me.btnVorgeschrieben.TabIndex = 14 Me.btnVorgeschrieben.Text = "3." & Global.Microsoft.VisualBasic.ChrW(10) & "VORGESCHR." Me.btnVorgeschrieben.UseVisualStyleBackColor = False @@ -1674,10 +1646,9 @@ Partial Class usrcntlAktDetails ' Me.lblTimeVorgeschreiben.Dock = System.Windows.Forms.DockStyle.Bottom Me.lblTimeVorgeschreiben.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblTimeVorgeschreiben.Location = New System.Drawing.Point(0, 62) - Me.lblTimeVorgeschreiben.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblTimeVorgeschreiben.Location = New System.Drawing.Point(0, 46) Me.lblTimeVorgeschreiben.Name = "lblTimeVorgeschreiben" - Me.lblTimeVorgeschreiben.Size = New System.Drawing.Size(156, 20) + Me.lblTimeVorgeschreiben.Size = New System.Drawing.Size(112, 13) Me.lblTimeVorgeschreiben.TabIndex = 0 Me.lblTimeVorgeschreiben.Text = "-" Me.lblTimeVorgeschreiben.TextAlign = System.Drawing.ContentAlignment.TopCenter @@ -1687,10 +1658,10 @@ Partial Class usrcntlAktDetails Me.Panel11.AutoSize = True Me.Panel11.Controls.Add(Me.btnAnkunft) Me.Panel11.Controls.Add(Me.lblTimeAnkunft) - Me.Panel11.Location = New System.Drawing.Point(528, 3) - Me.Panel11.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.Panel11.Location = New System.Drawing.Point(367, 2) + Me.Panel11.Margin = New System.Windows.Forms.Padding(1, 2, 1, 2) Me.Panel11.Name = "Panel11" - Me.Panel11.Size = New System.Drawing.Size(150, 82) + Me.Panel11.Size = New System.Drawing.Size(100, 59) Me.Panel11.TabIndex = 17 ' 'btnAnkunft @@ -1705,9 +1676,9 @@ Partial Class usrcntlAktDetails Me.btnAnkunft.ForeColor = System.Drawing.Color.White Me.btnAnkunft.Location = New System.Drawing.Point(0, 0) Me.btnAnkunft.Margin = New System.Windows.Forms.Padding(0) - Me.btnAnkunft.MinimumSize = New System.Drawing.Size(150, 0) + Me.btnAnkunft.MinimumSize = New System.Drawing.Size(100, 0) Me.btnAnkunft.Name = "btnAnkunft" - Me.btnAnkunft.Size = New System.Drawing.Size(150, 62) + Me.btnAnkunft.Size = New System.Drawing.Size(100, 46) Me.btnAnkunft.TabIndex = 12 Me.btnAnkunft.Text = "4." & Global.Microsoft.VisualBasic.ChrW(10) & "ANKUNFT" Me.btnAnkunft.UseVisualStyleBackColor = False @@ -1716,10 +1687,9 @@ Partial Class usrcntlAktDetails ' Me.lblTimeAnkunft.Dock = System.Windows.Forms.DockStyle.Bottom Me.lblTimeAnkunft.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblTimeAnkunft.Location = New System.Drawing.Point(0, 62) - Me.lblTimeAnkunft.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblTimeAnkunft.Location = New System.Drawing.Point(0, 46) Me.lblTimeAnkunft.Name = "lblTimeAnkunft" - Me.lblTimeAnkunft.Size = New System.Drawing.Size(150, 20) + Me.lblTimeAnkunft.Size = New System.Drawing.Size(100, 13) Me.lblTimeAnkunft.TabIndex = 0 Me.lblTimeAnkunft.Text = "-" Me.lblTimeAnkunft.TextAlign = System.Drawing.ContentAlignment.TopCenter @@ -1729,10 +1699,10 @@ Partial Class usrcntlAktDetails Me.Panel12.AutoSize = True Me.Panel12.Controls.Add(Me.btnFreigabe) Me.Panel12.Controls.Add(Me.lblTimeFreigabe) - Me.Panel12.Location = New System.Drawing.Point(682, 3) - Me.Panel12.Margin = New System.Windows.Forms.Padding(2, 3, 3, 3) + Me.Panel12.Location = New System.Drawing.Point(469, 2) + Me.Panel12.Margin = New System.Windows.Forms.Padding(1, 2, 2, 2) Me.Panel12.Name = "Panel12" - Me.Panel12.Size = New System.Drawing.Size(150, 80) + Me.Panel12.Size = New System.Drawing.Size(100, 58) Me.Panel12.TabIndex = 17 ' 'btnFreigabe @@ -1747,9 +1717,9 @@ Partial Class usrcntlAktDetails Me.btnFreigabe.ForeColor = System.Drawing.Color.White Me.btnFreigabe.Location = New System.Drawing.Point(0, 0) Me.btnFreigabe.Margin = New System.Windows.Forms.Padding(0) - Me.btnFreigabe.MinimumSize = New System.Drawing.Size(150, 0) + Me.btnFreigabe.MinimumSize = New System.Drawing.Size(100, 0) Me.btnFreigabe.Name = "btnFreigabe" - Me.btnFreigabe.Size = New System.Drawing.Size(150, 62) + Me.btnFreigabe.Size = New System.Drawing.Size(100, 46) Me.btnFreigabe.TabIndex = 12 Me.btnFreigabe.Text = "5." & Global.Microsoft.VisualBasic.ChrW(10) & "FREIGABE" Me.btnFreigabe.UseVisualStyleBackColor = False @@ -1758,10 +1728,9 @@ Partial Class usrcntlAktDetails ' Me.lblTimeFreigabe.Dock = System.Windows.Forms.DockStyle.Bottom Me.lblTimeFreigabe.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblTimeFreigabe.Location = New System.Drawing.Point(0, 62) - Me.lblTimeFreigabe.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblTimeFreigabe.Location = New System.Drawing.Point(0, 46) Me.lblTimeFreigabe.Name = "lblTimeFreigabe" - Me.lblTimeFreigabe.Size = New System.Drawing.Size(150, 18) + Me.lblTimeFreigabe.Size = New System.Drawing.Size(100, 12) Me.lblTimeFreigabe.TabIndex = 0 Me.lblTimeFreigabe.Text = "-" Me.lblTimeFreigabe.TextAlign = System.Drawing.ContentAlignment.TopCenter @@ -1769,8 +1738,7 @@ Partial Class usrcntlAktDetails 'Panel2 ' Me.Panel2.AutoSize = True - Me.Panel2.Location = New System.Drawing.Point(839, 4) - Me.Panel2.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Panel2.Location = New System.Drawing.Point(3, 66) Me.Panel2.Name = "Panel2" Me.Panel2.Size = New System.Drawing.Size(0, 0) Me.Panel2.TabIndex = 18 @@ -1781,10 +1749,9 @@ Partial Class usrcntlAktDetails Me.lblInfoAviso.Cursor = System.Windows.Forms.Cursors.Hand Me.lblInfoAviso.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblInfoAviso.ForeColor = System.Drawing.SystemColors.WindowText - Me.lblInfoAviso.Location = New System.Drawing.Point(712, 134) - Me.lblInfoAviso.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblInfoAviso.Location = New System.Drawing.Point(475, 89) Me.lblInfoAviso.Name = "lblInfoAviso" - Me.lblInfoAviso.Size = New System.Drawing.Size(155, 20) + Me.lblInfoAviso.Size = New System.Drawing.Size(100, 13) Me.lblInfoAviso.TabIndex = 76 Me.lblInfoAviso.Text = "Aviso-Info anzeigen" Me.lblInfoAviso.Visible = False @@ -1796,9 +1763,8 @@ Partial Class usrcntlAktDetails Me.pnl.Controls.Add(Me.pnlStatus) Me.pnl.Dock = System.Windows.Forms.DockStyle.Top Me.pnl.Location = New System.Drawing.Point(0, 0) - Me.pnl.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.pnl.Name = "pnl" - Me.pnl.Size = New System.Drawing.Size(867, 54) + Me.pnl.Size = New System.Drawing.Size(575, 36) Me.pnl.TabIndex = 91 ' 'txtLKW_Nr @@ -1809,12 +1775,11 @@ Partial Class usrcntlAktDetails Me.txtLKW_Nr.BorderStyle = System.Windows.Forms.BorderStyle.None Me.txtLKW_Nr.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtLKW_Nr.ForeColor = System.Drawing.Color.White - Me.txtLKW_Nr.Location = New System.Drawing.Point(36, 14) - Me.txtLKW_Nr.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.txtLKW_Nr.Location = New System.Drawing.Point(24, 9) Me.txtLKW_Nr.MaxLength = 0 Me.txtLKW_Nr.Name = "txtLKW_Nr" Me.txtLKW_Nr.ReadOnly = True - Me.txtLKW_Nr.Size = New System.Drawing.Size(500, 28) + Me.txtLKW_Nr.Size = New System.Drawing.Size(330, 19) Me.txtLKW_Nr.TabIndex = 87 Me.txtLKW_Nr.TabStop = False Me.txtLKW_Nr.Text = "-" @@ -1824,10 +1789,9 @@ Partial Class usrcntlAktDetails Me.pnlStatus.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.pnlStatus.BackColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) Me.pnlStatus.Controls.Add(Me.lblStatus) - Me.pnlStatus.Location = New System.Drawing.Point(540, 0) - Me.pnlStatus.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.pnlStatus.Location = New System.Drawing.Point(357, 0) Me.pnlStatus.Name = "pnlStatus" - Me.pnlStatus.Size = New System.Drawing.Size(327, 54) + Me.pnlStatus.Size = New System.Drawing.Size(218, 36) Me.pnlStatus.TabIndex = 89 ' 'lblStatus @@ -1840,7 +1804,7 @@ Partial Class usrcntlAktDetails Me.lblStatus.Location = New System.Drawing.Point(0, 0) Me.lblStatus.Margin = New System.Windows.Forms.Padding(0) Me.lblStatus.Name = "lblStatus" - Me.lblStatus.Size = New System.Drawing.Size(322, 54) + Me.lblStatus.Size = New System.Drawing.Size(215, 36) Me.lblStatus.TabIndex = 1 Me.lblStatus.Text = "-" Me.lblStatus.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -1850,26 +1814,26 @@ Partial Class usrcntlAktDetails Me.conMenuVermerke.ImageScalingSize = New System.Drawing.Size(24, 24) Me.conMenuVermerke.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.conVermerkLöschen, Me.HervorhebenToolStripMenuItem, Me.ToolUeberweisungsBeleg, Me.toolVkReminder, Me.MitarbeiterAnzeigenToolStripMenuItem}) Me.conMenuVermerke.Name = "conMenuVermerke" - Me.conMenuVermerke.Size = New System.Drawing.Size(346, 154) + Me.conMenuVermerke.Size = New System.Drawing.Size(252, 154) ' 'conVermerkLöschen ' Me.conVermerkLöschen.Image = Global.AVISO.My.Resources.Resources.del Me.conVermerkLöschen.Name = "conVermerkLöschen" - Me.conVermerkLöschen.Size = New System.Drawing.Size(345, 30) + Me.conVermerkLöschen.Size = New System.Drawing.Size(251, 30) Me.conVermerkLöschen.Text = "Vermerk löschen" ' 'HervorhebenToolStripMenuItem ' Me.HervorhebenToolStripMenuItem.Name = "HervorhebenToolStripMenuItem" - Me.HervorhebenToolStripMenuItem.Size = New System.Drawing.Size(345, 30) + Me.HervorhebenToolStripMenuItem.Size = New System.Drawing.Size(251, 30) 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(345, 30) + Me.ToolUeberweisungsBeleg.Size = New System.Drawing.Size(251, 30) Me.ToolUeberweisungsBeleg.Text = "VK: Überweisungsbeleg erhalten" Me.ToolUeberweisungsBeleg.Visible = False ' @@ -1877,7 +1841,7 @@ Partial Class usrcntlAktDetails ' Me.toolVkReminder.Image = Global.AVISO.My.Resources.Resources.urgent Me.toolVkReminder.Name = "toolVkReminder" - Me.toolVkReminder.Size = New System.Drawing.Size(345, 30) + Me.toolVkReminder.Size = New System.Drawing.Size(251, 30) Me.toolVkReminder.Text = "VK: Reminder geschickt" Me.toolVkReminder.Visible = False ' @@ -1885,7 +1849,7 @@ Partial Class usrcntlAktDetails ' Me.MitarbeiterAnzeigenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.mitarbeiter_s Me.MitarbeiterAnzeigenToolStripMenuItem.Name = "MitarbeiterAnzeigenToolStripMenuItem" - Me.MitarbeiterAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(345, 30) + Me.MitarbeiterAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(251, 30) Me.MitarbeiterAnzeigenToolStripMenuItem.Text = "Mitarbeiter anzeigen" ' 'cntxtFormulare @@ -1893,18 +1857,18 @@ Partial Class usrcntlAktDetails Me.cntxtFormulare.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxtFormulare.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DispolisteTRToolStripMenuItem, Me.DispolisteENToolStripMenuItem}) Me.cntxtFormulare.Name = "cntxtFormulare" - Me.cntxtFormulare.Size = New System.Drawing.Size(190, 64) + Me.cntxtFormulare.Size = New System.Drawing.Size(144, 48) ' 'DispolisteTRToolStripMenuItem ' Me.DispolisteTRToolStripMenuItem.Name = "DispolisteTRToolStripMenuItem" - Me.DispolisteTRToolStripMenuItem.Size = New System.Drawing.Size(189, 30) + Me.DispolisteTRToolStripMenuItem.Size = New System.Drawing.Size(143, 22) Me.DispolisteTRToolStripMenuItem.Text = "Dispoliste TR" ' 'DispolisteENToolStripMenuItem ' Me.DispolisteENToolStripMenuItem.Name = "DispolisteENToolStripMenuItem" - Me.DispolisteENToolStripMenuItem.Size = New System.Drawing.Size(189, 30) + Me.DispolisteENToolStripMenuItem.Size = New System.Drawing.Size(143, 22) Me.DispolisteENToolStripMenuItem.Text = "Dispoliste EN" ' 'pnlOptionen @@ -1917,10 +1881,9 @@ Partial Class usrcntlAktDetails Me.pnlOptionen.Controls.Add(Me.btnLöschen) Me.pnlOptionen.Controls.Add(Me.btnÄndern) Me.pnlOptionen.Controls.Add(Me.btnTV) - Me.pnlOptionen.Location = New System.Drawing.Point(681, 212) - Me.pnlOptionen.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.pnlOptionen.Location = New System.Drawing.Point(454, 141) Me.pnlOptionen.Name = "pnlOptionen" - Me.pnlOptionen.Size = New System.Drawing.Size(173, 76) + Me.pnlOptionen.Size = New System.Drawing.Size(116, 51) Me.pnlOptionen.TabIndex = 82 Me.pnlOptionen.Visible = False ' @@ -1931,10 +1894,9 @@ Partial Class usrcntlAktDetails 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(4, 186) - Me.Button13.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button13.Location = New System.Drawing.Point(3, 124) Me.Button13.Name = "Button13" - Me.Button13.Size = New System.Drawing.Size(164, 42) + Me.Button13.Size = New System.Drawing.Size(109, 28) Me.Button13.TabIndex = 102 Me.Button13.TabStop = False Me.Button13.Text = "Freigabe Mail" @@ -1948,10 +1910,9 @@ Partial Class usrcntlAktDetails Me.Button14.ForeColor = System.Drawing.Color.Black Me.Button14.Image = Global.AVISO.My.Resources.Resources.android_note Me.Button14.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button14.Location = New System.Drawing.Point(3, 138) - Me.Button14.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button14.Location = New System.Drawing.Point(2, 92) Me.Button14.Name = "Button14" - Me.Button14.Size = New System.Drawing.Size(164, 42) + Me.Button14.Size = New System.Drawing.Size(109, 28) Me.Button14.TabIndex = 101 Me.Button14.TabStop = False Me.Button14.Text = "LKW QR" @@ -1965,10 +1926,9 @@ Partial Class usrcntlAktDetails Me.btnLöschen.ForeColor = System.Drawing.Color.Black Me.btnLöschen.Image = CType(resources.GetObject("btnLöschen.Image"), System.Drawing.Image) Me.btnLöschen.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnLöschen.Location = New System.Drawing.Point(3, 48) - Me.btnLöschen.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.btnLöschen.Location = New System.Drawing.Point(2, 32) Me.btnLöschen.Name = "btnLöschen" - Me.btnLöschen.Size = New System.Drawing.Size(164, 51) + Me.btnLöschen.Size = New System.Drawing.Size(109, 34) Me.btnLöschen.TabIndex = 4 Me.btnLöschen.Text = "Akt löschen" Me.btnLöschen.TextAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -1981,10 +1941,9 @@ Partial Class usrcntlAktDetails Me.btnÄndern.ForeColor = System.Drawing.Color.Black Me.btnÄndern.Image = CType(resources.GetObject("btnÄndern.Image"), System.Drawing.Image) Me.btnÄndern.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnÄndern.Location = New System.Drawing.Point(3, -2) - Me.btnÄndern.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.btnÄndern.Location = New System.Drawing.Point(2, -1) Me.btnÄndern.Name = "btnÄndern" - Me.btnÄndern.Size = New System.Drawing.Size(164, 51) + Me.btnÄndern.Size = New System.Drawing.Size(109, 34) Me.btnÄndern.TabIndex = 3 Me.btnÄndern.Text = "Akt bearbeiten" Me.btnÄndern.TextAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -1997,10 +1956,9 @@ Partial Class usrcntlAktDetails Me.btnTV.ForeColor = System.Drawing.Color.Black Me.btnTV.Image = CType(resources.GetObject("btnTV.Image"), System.Drawing.Image) Me.btnTV.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnTV.Location = New System.Drawing.Point(3, 98) - Me.btnTV.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.btnTV.Location = New System.Drawing.Point(2, 65) Me.btnTV.Name = "btnTV" - Me.btnTV.Size = New System.Drawing.Size(164, 42) + Me.btnTV.Size = New System.Drawing.Size(109, 28) Me.btnTV.TabIndex = 100 Me.btnTV.TabStop = False Me.btnTV.Text = "TV-Hinweis" @@ -2009,13 +1967,12 @@ Partial Class usrcntlAktDetails ' 'usrcntlAktDetails ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.Controls.Add(Me.pnlOptionen) Me.Controls.Add(Me.pnlDetailsRechts) - Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.Name = "usrcntlAktDetails" - Me.Size = New System.Drawing.Size(862, 874) + Me.Size = New System.Drawing.Size(575, 721) Me.pnlDetailsRechts.ResumeLayout(False) Me.pnlDetailsRechts.PerformLayout() Me.Panel3.ResumeLayout(False) @@ -2190,4 +2147,7 @@ Partial Class usrcntlAktDetails Friend WithEvents MitarbeiterAnzeigenToolStripMenuItem As ToolStripMenuItem Friend WithEvents txtMAinfo_AbklaerungTR As TextBox Friend WithEvents picMAinfo_AbklaerungTR As PictureBox + Friend WithEvents Button15 As Button + Friend WithEvents cbxLZRg As VERAG_PROG_ALLGEMEIN.MyCheckbox + Friend WithEvents cbxLZT1 As VERAG_PROG_ALLGEMEIN.MyCheckbox End Class diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index 510d7a7..64b9988 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -919,6 +919,14 @@ Public Class usrcntlAktDetails VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() + + Case "90" + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") + myVermerk.VermerkCodeId = 93 + Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) + VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) + init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() + Case "13" myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") myVermerk.VermerkCodeId = 14 @@ -1022,6 +1030,17 @@ Public Class usrcntlAktDetails frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) End If End If + + Case "82" + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("eingereicht", "fertig") + myVermerk.VermerkCodeId = 83 + Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) + VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) + VermerkeDAL.UpdateLKW(myVermerk.AvisoID, False) + ' avisoAktualisierenAktiveIdBehalten(myVermerk.AvisoID) + 'Vermerke_aktualisieren() + init = True ' Vermerke_anzeigen(e.RowIndex) + End Select loaded = False ' Dim tmpIndex = -1 @@ -1089,6 +1108,11 @@ Public Class usrcntlAktDetails optionCell.Value = "CMR erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'CMR erhalten' einzutragen." End If + Case 90 + If Not existCodeInGridVermerke(93, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + optionCell.Value = "Packliste erhalten" + optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Packliste erhalten' einzutragen." + End If Case 13 If r.Cells("VorauskasseId").Value IsNot DBNull.Value Then @@ -1165,6 +1189,11 @@ Public Class usrcntlAktDetails optionCell.Value = "ATB-Nr. erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'ATB-Nr. erhalten' einzutragen." End If + Case 82 + If Not existCodeInGridVermerke(83) Then + optionCell.Value = "DE-ZOLL fertig" + optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'DE-ZOLL (DIGITAL) fertig' einzutragen." + End If End Select End If @@ -2602,9 +2631,11 @@ Public Class usrcntlAktDetails End If End Sub - Private Sub Button10_Click(sender As Object, e As EventArgs) Handles Button10.Click + Private Sub Button10_Click(sender As Object, e As EventArgs) Handles Button10.Click, Button15.Click pnlDetailsRechts.Cursor = Cursors.WaitCursor + Dim loadAttachRg = True ' (sender Is Button15) + Dim ANH_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge) VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge.LOAD_LIST_ByAviso(ANH_LIST, AvisoID) 'LÄDT alle Aviso-Anhänge For Each l In ANH_LIST @@ -2624,8 +2655,91 @@ Public Class usrcntlAktDetails End If Next - Dim path = SDL.FormularManagerNEU.LaufzettelZollDE(AvisoID, False) - If path <> "" Then Process.Start(path) + 'DIGITALE ABFERTIGUNG: + If (sender Is Button15) Then + Try + Dim SENDUNG_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cSendungen) + VERAG_PROG_ALLGEMEIN.cSendungen.LOAD_LIST(SENDUNG_LIST, -1, AvisoID) 'LÄDT alle SENDUNGSDATEN + + For Each s In SENDUNG_LIST + If If(s.tblSnd_Vorpapier, "") = "" Then + MsgBox("Nicht alle Sendungen haben ein Vorpapier eingetragen!" & vbNewLine & "Laufzettelerstellung wird abgebrochen.") + Exit Sub : pnlDetailsRechts.Cursor = Cursors.Default + End If + Next + AVISO.LOAD_Vorpapiere() + Dim VP_Enum = VERAG_PROG_ALLGEMEIN.cSendungen.VP_Enum(SENDUNG_LIST) 'Filtert nach eindeutigen Vorpapieren + + Dim paths As New List(Of String) + For Each VP In VP_Enum + paths.Add(SDL.FormularManagerNEU.LaufzettelZollDE_VP(AvisoID, False,, VP)) + Next + + Dim outl As New Outlook.Application + Dim Mail As Microsoft.Office.Interop.Outlook.MailItem + Mail = outl.CreateItem(0) + + Select Case AVISO.Grenzstelle + Case "SUB" + Mail.To = "abfertigung.za-suben@zoll.bund.de" + End Select + + Dim tX As New VERAG_PROG_ALLGEMEIN.cTextkonserve("LAUFZETTEL_DIGITAL", "LAUFZETTEL_DE_DIGITAL_SUB", "DE", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) + Dim MAIL_SUBJ = tX.txt_betreff.Replace("%LKWKennzeichen%", AVISO.LKW_Nr) + Dim MAIL_BODY = tX.txt_text.Replace("%LKWKennzeichen%", AVISO.LKW_Nr) + + addVPList(MAIL_BODY, VP_Enum) + Mail.HTMLBody = "
" & MAIL_BODY & SDL.cFakturierung.getSignature("DE", tX.txt_firmaSig, True) & "
" + Mail.Subject = MAIL_SUBJ + + For Each p In paths + Mail.Attachments.Add(p, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , "Gestellungsliste.pdf") + Next + + + If loadAttachRg Then + If cbxLZT1.Visible AndAlso cbxLZT1.Checked Then + 'Falls CMR, Vorpapier in den Unterlagen vorhanden, werden diese beigefügt + For Each l In ANH_LIST + Select Case l.anh_Art.ToString.ToUpper + Case "VORPAPIER" ', "CMR" + Mail.Attachments.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(l.anh_docId), Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue) + End Select + Next + End If + + If cbxLZRg.Visible AndAlso cbxLZRg.Checked Then + For Each s In SENDUNG_LIST + Select Case s.tblSnd_Abfertigungsart_ID + 'Falls RECHNUNGen in den Unterlagen vorhanden, werden diese beigefügt + Case "5", "45", "28" 'T1, Ü-T1, DE-FISK + Dim ANH_LIST_SND As New List(Of VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge) + VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge.LOAD_LIST_BySendung(ANH_LIST_SND, s.tblSnd_SendungID) 'LÄDT alle Aviso-Anhänge + For Each l In ANH_LIST_SND + Select Case l.anh_Art.ToString.ToUpper + Case "RECHNUNG", "HANDELSRECHNUNG" + Mail.Attachments.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(l.anh_docId), Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue) + End Select + Next + End Select + Next + End If + End If + + Mail.Display() + + Catch ex As Exception + MsgBox("Fehler beim erstellen der E-Mail:" & vbNewLine & ex.Message & ex.StackTrace) + End Try + + Else + Dim path = SDL.FormularManagerNEU.LaufzettelZollDE(AvisoID, False) + If path <> "" Then + + Process.Start(path) + End If + End If + Panel4.Visible = False pnlDetailsRechts.Cursor = Cursors.Default End Sub @@ -2662,6 +2776,15 @@ Public Class usrcntlAktDetails End If End Sub + Sub addVPList(ByRef MAIL_BODY As String, VP_Enum As List(Of String)) + Dim Platzhalter = "

" + Platzhalter &= "" + For Each VP In VP_Enum + Platzhalter &= "" + Next + Platzhalter &= "
Vorpapier:
" & VP & "
" + MAIL_BODY = MAIL_BODY.Replace("%Platzhalter%", Platzhalter) + End Sub Private Sub HervorhebenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles HervorhebenToolStripMenuItem.Click If gridVermerke.SelectedRows.Count = 0 Then Exit Sub Dim index As Integer = -1