diff --git a/Aviso/Benutzerdefinierte Elemente/SendTAB.Designer.vb b/Aviso/Benutzerdefinierte Elemente/SendTAB.Designer.vb index d436dd1..e707483 100644 --- a/Aviso/Benutzerdefinierte Elemente/SendTAB.Designer.vb +++ b/Aviso/Benutzerdefinierte Elemente/SendTAB.Designer.vb @@ -25,6 +25,7 @@ Partial Class sendTAB Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(sendTAB)) Me.pnl = New System.Windows.Forms.Panel() + Me.lblColliWeight = New System.Windows.Forms.Label() Me.pic = New System.Windows.Forms.PictureBox() Me.lblAuftr = New System.Windows.Forms.Label() Me.lblAbfBez = New System.Windows.Forms.Label() @@ -39,6 +40,7 @@ Partial Class sendTAB 'pnl ' Me.pnl.BackColor = System.Drawing.Color.LightGray + Me.pnl.Controls.Add(Me.lblColliWeight) Me.pnl.Controls.Add(Me.pic) Me.pnl.Controls.Add(Me.lblAuftr) Me.pnl.Controls.Add(Me.lblAbfBez) @@ -47,14 +49,31 @@ Partial Class sendTAB Me.pnl.Location = New System.Drawing.Point(0, 0) Me.pnl.Margin = New System.Windows.Forms.Padding(0) Me.pnl.Name = "pnl" - Me.pnl.Size = New System.Drawing.Size(90, 50) + Me.pnl.Size = New System.Drawing.Size(100, 60) Me.pnl.TabIndex = 0 ' + 'lblColliWeight + ' + Me.lblColliWeight.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblColliWeight.BackColor = System.Drawing.Color.DarkGray + Me.lblColliWeight.Cursor = System.Windows.Forms.Cursors.Hand + Me.lblColliWeight.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.5!) + Me.lblColliWeight.Location = New System.Drawing.Point(1, 47) + Me.lblColliWeight.Margin = New System.Windows.Forms.Padding(0) + Me.lblColliWeight.Name = "lblColliWeight" + Me.lblColliWeight.Size = New System.Drawing.Size(100, 13) + Me.lblColliWeight.TabIndex = 4 + Me.lblColliWeight.Text = "-" + Me.lblColliWeight.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.lblColliWeight.UseCompatibleTextRendering = True + ' 'pic ' + Me.pic.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.pic.Cursor = System.Windows.Forms.Cursors.Hand Me.pic.Image = CType(resources.GetObject("pic.Image"), System.Drawing.Image) - Me.pic.Location = New System.Drawing.Point(78, 2) + Me.pic.Location = New System.Drawing.Point(88, 2) Me.pic.Name = "pic" Me.pic.Size = New System.Drawing.Size(10, 10) Me.pic.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom @@ -63,10 +82,13 @@ Partial Class sendTAB ' 'lblAuftr ' + Me.lblAuftr.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAuftr.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAuftr.Location = New System.Drawing.Point(3, 19) Me.lblAuftr.Name = "lblAuftr" - Me.lblAuftr.Size = New System.Drawing.Size(86, 31) + Me.lblAuftr.Size = New System.Drawing.Size(96, 27) Me.lblAuftr.TabIndex = 2 Me.lblAuftr.TextAlign = System.Drawing.ContentAlignment.MiddleLeft ' @@ -94,7 +116,7 @@ Partial Class sendTAB ' Me.cntxt.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SendungDuplizierenToolStripMenuItem}) Me.cntxt.Name = "cntxt" - Me.cntxt.Size = New System.Drawing.Size(184, 48) + Me.cntxt.Size = New System.Drawing.Size(184, 26) ' 'SendungDuplizierenToolStripMenuItem ' @@ -110,7 +132,7 @@ Partial Class sendTAB Me.Controls.Add(Me.pnl) Me.Margin = New System.Windows.Forms.Padding(2, 2, 0, 0) Me.Name = "sendTAB" - Me.Size = New System.Drawing.Size(90, 50) + Me.Size = New System.Drawing.Size(100, 60) Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit() @@ -125,5 +147,5 @@ Partial Class sendTAB Friend WithEvents pic As System.Windows.Forms.PictureBox Friend WithEvents cntxt As System.Windows.Forms.ContextMenuStrip Friend WithEvents SendungDuplizierenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - + Public WithEvents lblColliWeight As Label End Class diff --git a/Aviso/Benutzerdefinierte Elemente/SendTAB.resx b/Aviso/Benutzerdefinierte Elemente/SendTAB.resx index 38a0cf3..41eddf8 100644 --- a/Aviso/Benutzerdefinierte Elemente/SendTAB.resx +++ b/Aviso/Benutzerdefinierte Elemente/SendTAB.resx @@ -165,16 +165,15 @@ XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ - 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEwAACxMBAJqcGAAAAdtJREFUSEu91b8vX1Ec - xnG/F8IiUWksTSr+Af+AoQYGtYrFJoLBn/BFLDaJRBNiYrAZDZams6QpdpWIVjo1EcL1PnKOfM65z/3e - izC8kt7PeT7nSVSOhizL3pUcOrVarUnNX0sOHQq70KPOXkMOKRrAJn5VLSXX6Pe21HmQG7DwGYfIvEql - ZJqw4Xe2VcaJPgi2Yx03frFSKWe9WMYfhB1ZGn0QOjULKVnK7CN2fCaVK40+CIQfSZFcKd+L+O/PlX2b - f/pHQGAlWUg9lsL9guziDirn3OOvvT8qCwhVKV1LZsoVxu3dUZFFsKzUXabmwRlm0WnvjUpShMtKi5xg - WN2ZG6RYfEnpDBrVfbmBwvKeuayeA4yg8B2WwxQXLPgLy8yrfUsOAy7oxzf88xeW+Y26z6AcOiy2wZWp - i+uRL1Ighyx0Ywn2bXyOwtLcgGAf3AuiLrKOxMySpdGHQ2gV136pnilUeZE+2PujMidZUH5iEh0+X1Z6 - bu+PyhwCE8mCdYkxsVNU6v6u/rDZaDEg9NUsBReYQ/Q2mh1VeoxBm4uWLIK21P1ffFE5i0wovYV7dYbQ - YjPRQopwKJ1W5wpZV/odn9R5bpBicQyt6qwI+VE0q7Pc4K3J4dvJGh4AKs9H2nJin04AAAAASUVORK5C - YII= + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEQAACxEBf2RfkQAAAa1JREFUSEu91U2rTlEY + xvHj4EyIieIkE0W+gC9gwIABpicTMwkDH+GHTMyUosiIgZmhgYmMlbzMUfKSkRLxaNfatbvXvZ+1T+dl + 8J9ca133v/Z+9v0szGazhc2kCnqwGLP1oAp6sBt7Y75WqqADR3Afb6ZKsaX0HsSzIVWAQ3iOWWGStHsF + uFs6D+N5TyztwB38HgibUizjBr4OOqk0Ft8HUVOK/XiU3E+lsdw/kjEqKa7hZ3K35+mosAy4mZQqafmB + PMbf5E7PP3ybK1yF9HaSR77jbFM4UdoNi9mQD7iEXZOEE6VjvMOJOK8pXIP0YrcI4qxJwiJ9kgzNeIaT + 8/ZwFWTgajI840rsRqogiA7jHn4kwzM+xu80UgUD2VKRxaEtquXQFGIProfduBpGpVWAA2WDxCGRV0nW + lGbCW/iVDIicn/DJdNJ9LWEsRV7jHHaW+y3pp5ZwJSn1fMHppDMm7f5XX84VlgFnkvJnXI67sSF9i6NN + YSLt3sXxeCcykP4pW+cYtg3vVKUwoJdeiGdjFOkLHIxnHVUQ6d4Ztsd8HjiFrTHvqIKNpgo2mv8qz0fa + BPXDKgAAAABJRU5ErkJggg== diff --git a/Aviso/Benutzerdefinierte Elemente/SendTAB.vb b/Aviso/Benutzerdefinierte Elemente/SendTAB.vb index 6bc6736..2c9b355 100644 --- a/Aviso/Benutzerdefinierte Elemente/SendTAB.vb +++ b/Aviso/Benutzerdefinierte Elemente/SendTAB.vb @@ -7,12 +7,12 @@ Dim list As List(Of MyListItem) - Private Sub Label2_Click(sender As Object, e As EventArgs) Handles lblAuftr.Click, lblAbfBez.Click, pnl.Click, Me.Click, lblNr.Click + Private Sub Label2_Click(sender As Object, e As EventArgs) Handles lblAuftr.Click, lblAbfBez.Click, pnl.Click, Me.Click, lblNr.Click, lblColliWeight.Click RaiseEvent MECLICK(Me) End Sub - Private Sub Label2_Click(sender As Object, e As MouseEventArgs) Handles lblAuftr.MouseClick, lblAbfBez.MouseClick, pnl.MouseClick, Me.MouseClick, lblNr.MouseClick, pnl.Click, MyBase.Click, lblNr.Click, lblAuftr.Click, lblAbfBez.Click + Private Sub Label2_Click(sender As Object, e As MouseEventArgs) Handles lblAuftr.MouseClick, lblAbfBez.MouseClick, pnl.MouseClick, Me.MouseClick, lblNr.MouseClick, pnl.Click, MyBase.Click, lblNr.Click, lblAuftr.Click, lblAbfBez.Click, lblColliWeight.Click If e.Button = MouseButtons.Right Then Me.ContextMenuStrip = cntxt cntxt.Show(MousePosition) diff --git a/Aviso/frmSendungsdetailsNEU.Designer.vb b/Aviso/frmSendungsdetailsNEU.Designer.vb index 294909f..4ddc28e 100644 --- a/Aviso/frmSendungsdetailsNEU.Designer.vb +++ b/Aviso/frmSendungsdetailsNEU.Designer.vb @@ -133,6 +133,7 @@ Partial Class frmSendungsdetailsNEU Me.Label25 = New System.Windows.Forms.Label() Me.Button7 = New System.Windows.Forms.Button() Me.TabPage3 = New System.Windows.Forms.TabPage() + Me.RCntrlVermerke1 = New AVISO.rCntrlVermerke() Me.gridVermerke = New System.Windows.Forms.DataGridView() Me.tbDigicust = New System.Windows.Forms.TabPage() Me.dgvDigicust = New System.Windows.Forms.DataGridView() @@ -259,10 +260,35 @@ Partial Class frmSendungsdetailsNEU Me.btnAvisierer = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.Button4 = New System.Windows.Forms.Button() Me.Button1 = New System.Windows.Forms.Button() + Me.cntlFrachtfuehrer_Sonst = New AVISO.usrcntlCheckBox() + Me.cntlAbsender_Sonst = New AVISO.usrcntlCheckBox() + Me.cntlEmpfaenger_Sonst = New AVISO.usrcntlCheckBox() + Me.cntlAuftraggeber_Sonst = New AVISO.usrcntlCheckBox() + Me.cntlAvisierer_Sonst = New AVISO.usrcntlCheckBox() Me.lblSonstigesKosten = New System.Windows.Forms.Label() Me.btnAufschub_Atr = New System.Windows.Forms.Button() Me.btnAufschub_Empf = New System.Windows.Forms.Button() Me.btnAufschub_VERAG = New System.Windows.Forms.Button() + Me.cntlFrachtf_Clear = New AVISO.usrcntlCheckBox() + Me.cntlFrachtf_Abf = New AVISO.usrcntlCheckBox() + Me.cntlFrachtf_Eust = New AVISO.usrcntlCheckBox() + Me.cntlFrachtf_Zoll = New AVISO.usrcntlCheckBox() + Me.cntlAbsender_Clear = New AVISO.usrcntlCheckBox() + Me.cntlAbsender_Abf = New AVISO.usrcntlCheckBox() + Me.cntlAbsender_Eust = New AVISO.usrcntlCheckBox() + Me.cntlAbsender_Zoll = New AVISO.usrcntlCheckBox() + Me.cntlEmpf_Clear = New AVISO.usrcntlCheckBox() + Me.cntlEmpf_Abf = New AVISO.usrcntlCheckBox() + Me.cntlEmpf_Eust = New AVISO.usrcntlCheckBox() + Me.cntlEmpf_Zoll = New AVISO.usrcntlCheckBox() + Me.cntlAuftr_Clear = New AVISO.usrcntlCheckBox() + Me.cntlAuftr_Abf = New AVISO.usrcntlCheckBox() + Me.cntlAuftr_Eust = New AVISO.usrcntlCheckBox() + Me.cntlAuftr_Zoll = New AVISO.usrcntlCheckBox() + Me.cntlAvisierer_Clear = New AVISO.usrcntlCheckBox() + Me.cntlAvisierer_Abf = New AVISO.usrcntlCheckBox() + Me.cntlAvisierer_Eust = New AVISO.usrcntlCheckBox() + Me.cntlAvisierer_Zoll = New AVISO.usrcntlCheckBox() Me.Panel15 = New System.Windows.Forms.Panel() Me.txtAvisierer = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.txtAuftraggeber = New VERAG_PROG_ALLGEMEIN.KdSearchBox() @@ -275,6 +301,7 @@ Partial Class frmSendungsdetailsNEU Me.lblEmpfAufschubEust = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.lblFrachtfuehrer = New System.Windows.Forms.Label() Me.pnlT1 = New System.Windows.Forms.Panel() + Me.UsrCntlSND_NCTSGestellungsadresse1 = New AVISO.usrCntlSND_NCTSGestellungsadresse() Me.Label43 = New System.Windows.Forms.Label() Me.lblAbsender = New System.Windows.Forms.Label() Me.txtAbsenderKdNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -348,14 +375,14 @@ Partial Class frmSendungsdetailsNEU Me.txtAbfertigungsnummer = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.lblFilialeAbfNr = New System.Windows.Forms.Label() Me.Panel2 = New System.Windows.Forms.Panel() + Me.FlowLayoutPanel = New System.Windows.Forms.FlowLayoutPanel() + Me.FlatButton2 = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.Panel1 = New System.Windows.Forms.Panel() Me.Button13 = New System.Windows.Forms.Button() Me.lblSendungen = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label() Me.pnlheader = New System.Windows.Forms.Panel() Me.Label2 = New System.Windows.Forms.Label() - Me.FlowLayoutPanel = New System.Windows.Forms.FlowLayoutPanel() - Me.FlatButton2 = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.Panel7 = New System.Windows.Forms.Panel() Me.pnlValidation = New System.Windows.Forms.Panel() Me.rtbValidierung = New VERAG_PROG_ALLGEMEIN.MyRichTextBox() @@ -480,33 +507,6 @@ Partial Class frmSendungsdetailsNEU Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn4 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn5 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.RCntrlVermerke1 = New AVISO.rCntrlVermerke() - Me.cntlFrachtfuehrer_Sonst = New AVISO.usrcntlCheckBox() - Me.cntlAbsender_Sonst = New AVISO.usrcntlCheckBox() - Me.cntlEmpfaenger_Sonst = New AVISO.usrcntlCheckBox() - Me.cntlAuftraggeber_Sonst = New AVISO.usrcntlCheckBox() - Me.cntlAvisierer_Sonst = New AVISO.usrcntlCheckBox() - Me.cntlFrachtf_Clear = New AVISO.usrcntlCheckBox() - Me.cntlFrachtf_Abf = New AVISO.usrcntlCheckBox() - Me.cntlFrachtf_Eust = New AVISO.usrcntlCheckBox() - Me.cntlFrachtf_Zoll = New AVISO.usrcntlCheckBox() - Me.cntlAbsender_Clear = New AVISO.usrcntlCheckBox() - Me.cntlAbsender_Abf = New AVISO.usrcntlCheckBox() - Me.cntlAbsender_Eust = New AVISO.usrcntlCheckBox() - Me.cntlAbsender_Zoll = New AVISO.usrcntlCheckBox() - Me.cntlEmpf_Clear = New AVISO.usrcntlCheckBox() - Me.cntlEmpf_Abf = New AVISO.usrcntlCheckBox() - Me.cntlEmpf_Eust = New AVISO.usrcntlCheckBox() - Me.cntlEmpf_Zoll = New AVISO.usrcntlCheckBox() - Me.cntlAuftr_Clear = New AVISO.usrcntlCheckBox() - Me.cntlAuftr_Abf = New AVISO.usrcntlCheckBox() - Me.cntlAuftr_Eust = New AVISO.usrcntlCheckBox() - Me.cntlAuftr_Zoll = New AVISO.usrcntlCheckBox() - Me.cntlAvisierer_Clear = New AVISO.usrcntlCheckBox() - Me.cntlAvisierer_Abf = New AVISO.usrcntlCheckBox() - Me.cntlAvisierer_Eust = New AVISO.usrcntlCheckBox() - Me.cntlAvisierer_Zoll = New AVISO.usrcntlCheckBox() - Me.UsrCntlSND_NCTSGestellungsadresse1 = New AVISO.usrCntlSND_NCTSGestellungsadresse() Me.pnl.SuspendLayout() Me.Panel4.SuspendLayout() Me.TabControl1.SuspendLayout() @@ -569,9 +569,9 @@ Partial Class frmSendungsdetailsNEU CType(Me.picAVISOMessengerSNDChat, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnlFremd.SuspendLayout() Me.Panel2.SuspendLayout() + Me.FlowLayoutPanel.SuspendLayout() Me.Panel1.SuspendLayout() Me.pnlheader.SuspendLayout() - Me.FlowLayoutPanel.SuspendLayout() Me.Panel7.SuspendLayout() Me.pnlValidation.SuspendLayout() Me.Panel3.SuspendLayout() @@ -605,9 +605,9 @@ Partial Class frmSendungsdetailsNEU Me.Panel4.Controls.Add(Me.TabControl1) Me.Panel4.Controls.Add(Me.Panel14) Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill - Me.Panel4.Location = New System.Drawing.Point(0, 452) + Me.Panel4.Location = New System.Drawing.Point(0, 462) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(1235, 344) + Me.Panel4.Size = New System.Drawing.Size(1235, 334) Me.Panel4.TabIndex = 2 ' 'TabControl1 @@ -627,7 +627,7 @@ Partial Class frmSendungsdetailsNEU Me.TabControl1.Name = "TabControl1" Me.TabControl1.Padding = New System.Drawing.Point(12, 5) Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(1235, 341) + Me.TabControl1.Size = New System.Drawing.Size(1235, 331) Me.TabControl1.TabIndex = 1 ' 'tbKundenInfo @@ -638,7 +638,7 @@ Partial Class frmSendungsdetailsNEU Me.tbKundenInfo.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.tbKundenInfo.Location = New System.Drawing.Point(4, 29) Me.tbKundenInfo.Name = "tbKundenInfo" - Me.tbKundenInfo.Size = New System.Drawing.Size(1227, 308) + Me.tbKundenInfo.Size = New System.Drawing.Size(1227, 298) Me.tbKundenInfo.TabIndex = 5 Me.tbKundenInfo.Text = "Kundeninfo" Me.tbKundenInfo.UseVisualStyleBackColor = True @@ -650,7 +650,7 @@ Partial Class frmSendungsdetailsNEU Me.pnlKundenInfo.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlKundenInfo.Location = New System.Drawing.Point(0, 10) Me.pnlKundenInfo.Name = "pnlKundenInfo" - Me.pnlKundenInfo.Size = New System.Drawing.Size(1227, 298) + Me.pnlKundenInfo.Size = New System.Drawing.Size(1227, 288) Me.pnlKundenInfo.TabIndex = 1 ' 'Panel20 @@ -1038,7 +1038,7 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem8.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripMenuItem8.Image = Global.AVISO.My.Resources.Resources.plus Me.ToolStripMenuItem8.Name = "ToolStripMenuItem8" - Me.ToolStripMenuItem8.Size = New System.Drawing.Size(94, 22) + Me.ToolStripMenuItem8.Size = New System.Drawing.Size(102, 30) Me.ToolStripMenuItem8.Text = "T1" ' 'ToolStripMenuItem9 @@ -1046,7 +1046,7 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem9.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripMenuItem9.Image = Global.AVISO.My.Resources.Resources.plus Me.ToolStripMenuItem9.Name = "ToolStripMenuItem9" - Me.ToolStripMenuItem9.Size = New System.Drawing.Size(94, 22) + Me.ToolStripMenuItem9.Size = New System.Drawing.Size(102, 30) Me.ToolStripMenuItem9.Text = "T2" ' 'ToolStripMenuItem10 @@ -1054,7 +1054,7 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem10.Enabled = False Me.ToolStripMenuItem10.Image = Global.AVISO.My.Resources.Resources.plus Me.ToolStripMenuItem10.Name = "ToolStripMenuItem10" - Me.ToolStripMenuItem10.Size = New System.Drawing.Size(94, 22) + Me.ToolStripMenuItem10.Size = New System.Drawing.Size(102, 30) Me.ToolStripMenuItem10.Text = "Ü-T" Me.ToolStripMenuItem10.Visible = False ' @@ -1099,7 +1099,7 @@ Partial Class frmSendungsdetailsNEU ' Me.ToolStripMenuItem20.Image = Global.AVISO.My.Resources.Resources.plus Me.ToolStripMenuItem20.Name = "ToolStripMenuItem20" - Me.ToolStripMenuItem20.Size = New System.Drawing.Size(95, 22) + Me.ToolStripMenuItem20.Size = New System.Drawing.Size(103, 30) Me.ToolStripMenuItem20.Text = "EZA" ' 'ToolStripMenuItem18 @@ -1108,7 +1108,7 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem18.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripMenuItem18.Image = Global.AVISO.My.Resources.Resources.plus Me.ToolStripMenuItem18.Name = "ToolStripMenuItem18" - Me.ToolStripMenuItem18.Size = New System.Drawing.Size(95, 22) + Me.ToolStripMenuItem18.Size = New System.Drawing.Size(103, 30) Me.ToolStripMenuItem18.Text = "T1" ' 'ToolStripMenuItem19 @@ -1117,7 +1117,7 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem19.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripMenuItem19.Image = Global.AVISO.My.Resources.Resources.plus Me.ToolStripMenuItem19.Name = "ToolStripMenuItem19" - Me.ToolStripMenuItem19.Size = New System.Drawing.Size(95, 22) + Me.ToolStripMenuItem19.Size = New System.Drawing.Size(103, 30) Me.ToolStripMenuItem19.Text = "T2" ' 'toolSendMIC @@ -1135,7 +1135,7 @@ Partial Class frmSendungsdetailsNEU ' Me.ToolStripMenuItem22.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1 Me.ToolStripMenuItem22.Name = "ToolStripMenuItem22" - Me.ToolStripMenuItem22.Size = New System.Drawing.Size(176, 22) + Me.ToolStripMenuItem22.Size = New System.Drawing.Size(184, 30) Me.ToolStripMenuItem22.Text = "MIC Import senden" ' 'ToolStripMenuItem23 @@ -1143,7 +1143,7 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem23.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripMenuItem23.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1 Me.ToolStripMenuItem23.Name = "ToolStripMenuItem23" - Me.ToolStripMenuItem23.Size = New System.Drawing.Size(176, 22) + Me.ToolStripMenuItem23.Size = New System.Drawing.Size(184, 30) Me.ToolStripMenuItem23.Text = "MIC Transit senden" ' 'ToolStripMenuItem24 @@ -1152,7 +1152,7 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem24.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripMenuItem24.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1 Me.ToolStripMenuItem24.Name = "ToolStripMenuItem24" - Me.ToolStripMenuItem24.Size = New System.Drawing.Size(176, 22) + Me.ToolStripMenuItem24.Size = New System.Drawing.Size(184, 30) Me.ToolStripMenuItem24.Text = "MIC Export senden" ' 'toolSendDyModelTrans @@ -1169,21 +1169,21 @@ Partial Class frmSendungsdetailsNEU ' Me.toolModal_Import.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1 Me.toolModal_Import.Name = "toolModal_Import" - Me.toolModal_Import.Size = New System.Drawing.Size(145, 22) + Me.toolModal_Import.Size = New System.Drawing.Size(153, 30) Me.toolModal_Import.Text = "IMPORT" ' 'toolModal_Export ' Me.toolModal_Export.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1 Me.toolModal_Export.Name = "toolModal_Export" - Me.toolModal_Export.Size = New System.Drawing.Size(145, 22) + Me.toolModal_Export.Size = New System.Drawing.Size(153, 30) Me.toolModal_Export.Text = "EXPORT" ' 'toolModal_Transit ' Me.toolModal_Transit.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1 Me.toolModal_Transit.Name = "toolModal_Transit" - Me.toolModal_Transit.Size = New System.Drawing.Size(145, 22) + Me.toolModal_Transit.Size = New System.Drawing.Size(153, 30) Me.toolModal_Transit.Text = "TRANSIT (T1)" ' 'ToolStripMenuItem12 @@ -1746,6 +1746,14 @@ Partial Class frmSendungsdetailsNEU Me.TabPage3.Text = "Vermerke" Me.TabPage3.UseVisualStyleBackColor = True ' + 'RCntrlVermerke1 + ' + Me.RCntrlVermerke1.Dock = System.Windows.Forms.DockStyle.Fill + Me.RCntrlVermerke1.Location = New System.Drawing.Point(0, 0) + Me.RCntrlVermerke1.Name = "RCntrlVermerke1" + Me.RCntrlVermerke1.Size = New System.Drawing.Size(1227, 308) + Me.RCntrlVermerke1.TabIndex = 1 + ' 'gridVermerke ' Me.gridVermerke.AllowUserToAddRows = False @@ -1993,7 +2001,7 @@ Partial Class frmSendungsdetailsNEU Me.pnlDetails.Controls.Add(Me.Panel6) Me.pnlDetails.Controls.Add(Me.Panel5) Me.pnlDetails.Dock = System.Windows.Forms.DockStyle.Top - Me.pnlDetails.Location = New System.Drawing.Point(0, 55) + Me.pnlDetails.Location = New System.Drawing.Point(0, 65) Me.pnlDetails.MinimumSize = New System.Drawing.Size(0, 310) Me.pnlDetails.Name = "pnlDetails" Me.pnlDetails.Size = New System.Drawing.Size(1235, 397) @@ -3650,6 +3658,66 @@ Partial Class frmSendungsdetailsNEU Me.Button1.Text = "BAR - Beleg" Me.Button1.UseVisualStyleBackColor = False ' + 'cntlFrachtfuehrer_Sonst + ' + Me.cntlFrachtfuehrer_Sonst._abrArt = "SONST" + Me.cntlFrachtfuehrer_Sonst._beteiligter = "FRACHTF" + Me.cntlFrachtfuehrer_Sonst._readOnly = True + Me.cntlFrachtfuehrer_Sonst.Location = New System.Drawing.Point(632, 168) + Me.cntlFrachtfuehrer_Sonst.Name = "cntlFrachtfuehrer_Sonst" + Me.cntlFrachtfuehrer_Sonst.Size = New System.Drawing.Size(21, 20) + Me.cntlFrachtfuehrer_Sonst.TabIndex = 82 + Me.cntlFrachtfuehrer_Sonst.TabStop = False + Me.cntlFrachtfuehrer_Sonst.value = "" + ' + 'cntlAbsender_Sonst + ' + Me.cntlAbsender_Sonst._abrArt = "SONST" + Me.cntlAbsender_Sonst._beteiligter = "ABS" + Me.cntlAbsender_Sonst._readOnly = True + Me.cntlAbsender_Sonst.Location = New System.Drawing.Point(632, 133) + Me.cntlAbsender_Sonst.Name = "cntlAbsender_Sonst" + Me.cntlAbsender_Sonst.Size = New System.Drawing.Size(21, 20) + Me.cntlAbsender_Sonst.TabIndex = 68 + Me.cntlAbsender_Sonst.TabStop = False + Me.cntlAbsender_Sonst.value = "" + ' + 'cntlEmpfaenger_Sonst + ' + Me.cntlEmpfaenger_Sonst._abrArt = "SONST" + Me.cntlEmpfaenger_Sonst._beteiligter = "EMPF" + Me.cntlEmpfaenger_Sonst._readOnly = True + Me.cntlEmpfaenger_Sonst.Location = New System.Drawing.Point(632, 94) + Me.cntlEmpfaenger_Sonst.Name = "cntlEmpfaenger_Sonst" + Me.cntlEmpfaenger_Sonst.Size = New System.Drawing.Size(21, 20) + Me.cntlEmpfaenger_Sonst.TabIndex = 53 + Me.cntlEmpfaenger_Sonst.TabStop = False + Me.cntlEmpfaenger_Sonst.value = "" + ' + 'cntlAuftraggeber_Sonst + ' + Me.cntlAuftraggeber_Sonst._abrArt = "SONST" + Me.cntlAuftraggeber_Sonst._beteiligter = "AUFTR" + Me.cntlAuftraggeber_Sonst._readOnly = True + Me.cntlAuftraggeber_Sonst.Location = New System.Drawing.Point(632, 57) + Me.cntlAuftraggeber_Sonst.Name = "cntlAuftraggeber_Sonst" + Me.cntlAuftraggeber_Sonst.Size = New System.Drawing.Size(21, 20) + Me.cntlAuftraggeber_Sonst.TabIndex = 36 + Me.cntlAuftraggeber_Sonst.TabStop = False + Me.cntlAuftraggeber_Sonst.value = "" + ' + 'cntlAvisierer_Sonst + ' + Me.cntlAvisierer_Sonst._abrArt = "SONST" + Me.cntlAvisierer_Sonst._beteiligter = "AVISIERER" + Me.cntlAvisierer_Sonst._readOnly = True + Me.cntlAvisierer_Sonst.Location = New System.Drawing.Point(632, 20) + Me.cntlAvisierer_Sonst.Name = "cntlAvisierer_Sonst" + Me.cntlAvisierer_Sonst.Size = New System.Drawing.Size(21, 20) + Me.cntlAvisierer_Sonst.TabIndex = 21 + Me.cntlAvisierer_Sonst.TabStop = False + Me.cntlAvisierer_Sonst.value = "" + ' 'lblSonstigesKosten ' Me.lblSonstigesKosten.AutoSize = True @@ -3717,6 +3785,246 @@ Partial Class frmSendungsdetailsNEU Me.btnAufschub_VERAG.UseVisualStyleBackColor = False Me.btnAufschub_VERAG.Visible = False ' + 'cntlFrachtf_Clear + ' + Me.cntlFrachtf_Clear._abrArt = "CLEARING" + Me.cntlFrachtf_Clear._beteiligter = "FRACHTF" + Me.cntlFrachtf_Clear._readOnly = False + Me.cntlFrachtf_Clear.Location = New System.Drawing.Point(600, 168) + Me.cntlFrachtf_Clear.Name = "cntlFrachtf_Clear" + Me.cntlFrachtf_Clear.Size = New System.Drawing.Size(21, 20) + Me.cntlFrachtf_Clear.TabIndex = 81 + Me.cntlFrachtf_Clear.TabStop = False + Me.cntlFrachtf_Clear.value = "" + ' + 'cntlFrachtf_Abf + ' + Me.cntlFrachtf_Abf._abrArt = "ABFKOST" + Me.cntlFrachtf_Abf._beteiligter = "FRACHTF" + Me.cntlFrachtf_Abf._readOnly = False + Me.cntlFrachtf_Abf.Location = New System.Drawing.Point(569, 168) + Me.cntlFrachtf_Abf.Name = "cntlFrachtf_Abf" + Me.cntlFrachtf_Abf.Size = New System.Drawing.Size(21, 20) + Me.cntlFrachtf_Abf.TabIndex = 80 + Me.cntlFrachtf_Abf.TabStop = False + Me.cntlFrachtf_Abf.value = "" + ' + 'cntlFrachtf_Eust + ' + Me.cntlFrachtf_Eust._abrArt = "EUST" + Me.cntlFrachtf_Eust._beteiligter = "FRACHTF" + Me.cntlFrachtf_Eust._readOnly = False + Me.cntlFrachtf_Eust.Location = New System.Drawing.Point(538, 168) + Me.cntlFrachtf_Eust.Name = "cntlFrachtf_Eust" + Me.cntlFrachtf_Eust.Size = New System.Drawing.Size(21, 20) + Me.cntlFrachtf_Eust.TabIndex = 79 + Me.cntlFrachtf_Eust.TabStop = False + Me.cntlFrachtf_Eust.value = "" + ' + 'cntlFrachtf_Zoll + ' + Me.cntlFrachtf_Zoll._abrArt = "ZOLL" + Me.cntlFrachtf_Zoll._beteiligter = "FRACHTF" + Me.cntlFrachtf_Zoll._readOnly = False + Me.cntlFrachtf_Zoll.Location = New System.Drawing.Point(507, 168) + Me.cntlFrachtf_Zoll.Name = "cntlFrachtf_Zoll" + Me.cntlFrachtf_Zoll.Size = New System.Drawing.Size(21, 20) + Me.cntlFrachtf_Zoll.TabIndex = 78 + Me.cntlFrachtf_Zoll.TabStop = False + Me.cntlFrachtf_Zoll.value = "" + ' + 'cntlAbsender_Clear + ' + Me.cntlAbsender_Clear._abrArt = "CLEARING" + Me.cntlAbsender_Clear._beteiligter = "ABS" + Me.cntlAbsender_Clear._readOnly = False + Me.cntlAbsender_Clear.Location = New System.Drawing.Point(600, 133) + Me.cntlAbsender_Clear.Name = "cntlAbsender_Clear" + Me.cntlAbsender_Clear.Size = New System.Drawing.Size(21, 20) + Me.cntlAbsender_Clear.TabIndex = 67 + Me.cntlAbsender_Clear.TabStop = False + Me.cntlAbsender_Clear.value = "" + ' + 'cntlAbsender_Abf + ' + Me.cntlAbsender_Abf._abrArt = "ABFKOST" + Me.cntlAbsender_Abf._beteiligter = "ABS" + Me.cntlAbsender_Abf._readOnly = False + Me.cntlAbsender_Abf.Location = New System.Drawing.Point(569, 133) + Me.cntlAbsender_Abf.Name = "cntlAbsender_Abf" + Me.cntlAbsender_Abf.Size = New System.Drawing.Size(21, 20) + Me.cntlAbsender_Abf.TabIndex = 66 + Me.cntlAbsender_Abf.TabStop = False + Me.cntlAbsender_Abf.value = "" + ' + 'cntlAbsender_Eust + ' + Me.cntlAbsender_Eust._abrArt = "EUST" + Me.cntlAbsender_Eust._beteiligter = "ABS" + Me.cntlAbsender_Eust._readOnly = False + Me.cntlAbsender_Eust.Location = New System.Drawing.Point(538, 133) + Me.cntlAbsender_Eust.Name = "cntlAbsender_Eust" + Me.cntlAbsender_Eust.Size = New System.Drawing.Size(21, 20) + Me.cntlAbsender_Eust.TabIndex = 65 + Me.cntlAbsender_Eust.TabStop = False + Me.cntlAbsender_Eust.value = "" + ' + 'cntlAbsender_Zoll + ' + Me.cntlAbsender_Zoll._abrArt = "ZOLL" + Me.cntlAbsender_Zoll._beteiligter = "ABS" + Me.cntlAbsender_Zoll._readOnly = False + Me.cntlAbsender_Zoll.Location = New System.Drawing.Point(507, 133) + Me.cntlAbsender_Zoll.Name = "cntlAbsender_Zoll" + Me.cntlAbsender_Zoll.Size = New System.Drawing.Size(21, 20) + Me.cntlAbsender_Zoll.TabIndex = 64 + Me.cntlAbsender_Zoll.TabStop = False + Me.cntlAbsender_Zoll.value = "" + ' + 'cntlEmpf_Clear + ' + Me.cntlEmpf_Clear._abrArt = "CLEARING" + Me.cntlEmpf_Clear._beteiligter = "EMPF" + Me.cntlEmpf_Clear._readOnly = False + Me.cntlEmpf_Clear.Location = New System.Drawing.Point(600, 94) + Me.cntlEmpf_Clear.Name = "cntlEmpf_Clear" + Me.cntlEmpf_Clear.Size = New System.Drawing.Size(21, 20) + Me.cntlEmpf_Clear.TabIndex = 52 + Me.cntlEmpf_Clear.TabStop = False + Me.cntlEmpf_Clear.value = "" + ' + 'cntlEmpf_Abf + ' + Me.cntlEmpf_Abf._abrArt = "ABFKOST" + Me.cntlEmpf_Abf._beteiligter = "EMPF" + Me.cntlEmpf_Abf._readOnly = False + Me.cntlEmpf_Abf.Location = New System.Drawing.Point(569, 94) + Me.cntlEmpf_Abf.Name = "cntlEmpf_Abf" + Me.cntlEmpf_Abf.Size = New System.Drawing.Size(21, 20) + Me.cntlEmpf_Abf.TabIndex = 51 + Me.cntlEmpf_Abf.TabStop = False + Me.cntlEmpf_Abf.value = "" + ' + 'cntlEmpf_Eust + ' + Me.cntlEmpf_Eust._abrArt = "EUST" + Me.cntlEmpf_Eust._beteiligter = "EMPF" + Me.cntlEmpf_Eust._readOnly = False + Me.cntlEmpf_Eust.Location = New System.Drawing.Point(538, 94) + Me.cntlEmpf_Eust.Name = "cntlEmpf_Eust" + Me.cntlEmpf_Eust.Size = New System.Drawing.Size(21, 20) + Me.cntlEmpf_Eust.TabIndex = 50 + Me.cntlEmpf_Eust.TabStop = False + Me.cntlEmpf_Eust.value = "" + ' + 'cntlEmpf_Zoll + ' + Me.cntlEmpf_Zoll._abrArt = "ZOLL" + Me.cntlEmpf_Zoll._beteiligter = "EMPF" + Me.cntlEmpf_Zoll._readOnly = False + Me.cntlEmpf_Zoll.Location = New System.Drawing.Point(507, 94) + Me.cntlEmpf_Zoll.Name = "cntlEmpf_Zoll" + Me.cntlEmpf_Zoll.Size = New System.Drawing.Size(21, 20) + Me.cntlEmpf_Zoll.TabIndex = 49 + Me.cntlEmpf_Zoll.TabStop = False + Me.cntlEmpf_Zoll.value = "" + ' + 'cntlAuftr_Clear + ' + Me.cntlAuftr_Clear._abrArt = "CLEARING" + Me.cntlAuftr_Clear._beteiligter = "AUFTR" + Me.cntlAuftr_Clear._readOnly = False + Me.cntlAuftr_Clear.Location = New System.Drawing.Point(600, 57) + Me.cntlAuftr_Clear.Name = "cntlAuftr_Clear" + Me.cntlAuftr_Clear.Size = New System.Drawing.Size(21, 20) + Me.cntlAuftr_Clear.TabIndex = 35 + Me.cntlAuftr_Clear.TabStop = False + Me.cntlAuftr_Clear.value = "" + ' + 'cntlAuftr_Abf + ' + Me.cntlAuftr_Abf._abrArt = "ABFKOST" + Me.cntlAuftr_Abf._beteiligter = "AUFTR" + Me.cntlAuftr_Abf._readOnly = False + Me.cntlAuftr_Abf.Location = New System.Drawing.Point(569, 57) + Me.cntlAuftr_Abf.Name = "cntlAuftr_Abf" + Me.cntlAuftr_Abf.Size = New System.Drawing.Size(21, 20) + Me.cntlAuftr_Abf.TabIndex = 34 + Me.cntlAuftr_Abf.TabStop = False + Me.cntlAuftr_Abf.value = "" + ' + 'cntlAuftr_Eust + ' + Me.cntlAuftr_Eust._abrArt = "EUST" + Me.cntlAuftr_Eust._beteiligter = "AUFTR" + Me.cntlAuftr_Eust._readOnly = False + Me.cntlAuftr_Eust.Location = New System.Drawing.Point(538, 57) + Me.cntlAuftr_Eust.Name = "cntlAuftr_Eust" + Me.cntlAuftr_Eust.Size = New System.Drawing.Size(21, 20) + Me.cntlAuftr_Eust.TabIndex = 33 + Me.cntlAuftr_Eust.TabStop = False + Me.cntlAuftr_Eust.value = "" + ' + 'cntlAuftr_Zoll + ' + Me.cntlAuftr_Zoll._abrArt = "ZOLL" + Me.cntlAuftr_Zoll._beteiligter = "AUFTR" + Me.cntlAuftr_Zoll._readOnly = False + Me.cntlAuftr_Zoll.Location = New System.Drawing.Point(507, 57) + Me.cntlAuftr_Zoll.Name = "cntlAuftr_Zoll" + Me.cntlAuftr_Zoll.Size = New System.Drawing.Size(21, 20) + Me.cntlAuftr_Zoll.TabIndex = 32 + Me.cntlAuftr_Zoll.TabStop = False + Me.cntlAuftr_Zoll.value = "" + ' + 'cntlAvisierer_Clear + ' + Me.cntlAvisierer_Clear._abrArt = "CLEARING" + Me.cntlAvisierer_Clear._beteiligter = "AVISIERER" + Me.cntlAvisierer_Clear._readOnly = False + Me.cntlAvisierer_Clear.Location = New System.Drawing.Point(600, 20) + Me.cntlAvisierer_Clear.Name = "cntlAvisierer_Clear" + Me.cntlAvisierer_Clear.Size = New System.Drawing.Size(21, 20) + Me.cntlAvisierer_Clear.TabIndex = 20 + Me.cntlAvisierer_Clear.TabStop = False + Me.cntlAvisierer_Clear.value = "" + ' + 'cntlAvisierer_Abf + ' + Me.cntlAvisierer_Abf._abrArt = "ABFKOST" + Me.cntlAvisierer_Abf._beteiligter = "AVISIERER" + Me.cntlAvisierer_Abf._readOnly = False + Me.cntlAvisierer_Abf.Location = New System.Drawing.Point(569, 20) + Me.cntlAvisierer_Abf.Name = "cntlAvisierer_Abf" + Me.cntlAvisierer_Abf.Size = New System.Drawing.Size(21, 20) + Me.cntlAvisierer_Abf.TabIndex = 19 + Me.cntlAvisierer_Abf.TabStop = False + Me.cntlAvisierer_Abf.value = "" + ' + 'cntlAvisierer_Eust + ' + Me.cntlAvisierer_Eust._abrArt = "EUST" + Me.cntlAvisierer_Eust._beteiligter = "AVISIERER" + Me.cntlAvisierer_Eust._readOnly = False + Me.cntlAvisierer_Eust.Location = New System.Drawing.Point(538, 20) + Me.cntlAvisierer_Eust.Name = "cntlAvisierer_Eust" + Me.cntlAvisierer_Eust.Size = New System.Drawing.Size(21, 20) + Me.cntlAvisierer_Eust.TabIndex = 18 + Me.cntlAvisierer_Eust.TabStop = False + Me.cntlAvisierer_Eust.value = "" + ' + 'cntlAvisierer_Zoll + ' + Me.cntlAvisierer_Zoll._abrArt = "ZOLL" + Me.cntlAvisierer_Zoll._beteiligter = "AVISIERER" + Me.cntlAvisierer_Zoll._readOnly = False + Me.cntlAvisierer_Zoll.Location = New System.Drawing.Point(507, 20) + Me.cntlAvisierer_Zoll.Name = "cntlAvisierer_Zoll" + Me.cntlAvisierer_Zoll.Size = New System.Drawing.Size(21, 20) + Me.cntlAvisierer_Zoll.TabIndex = 17 + Me.cntlAvisierer_Zoll.TabStop = False + Me.cntlAvisierer_Zoll.value = "" + ' 'Panel15 ' Me.Panel15.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) @@ -3907,6 +4215,14 @@ Partial Class frmSendungsdetailsNEU Me.pnlT1.Size = New System.Drawing.Size(549, 118) Me.pnlT1.TabIndex = 86 ' + 'UsrCntlSND_NCTSGestellungsadresse1 + ' + Me.UsrCntlSND_NCTSGestellungsadresse1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlSND_NCTSGestellungsadresse1.Location = New System.Drawing.Point(0, 0) + Me.UsrCntlSND_NCTSGestellungsadresse1.Name = "UsrCntlSND_NCTSGestellungsadresse1" + Me.UsrCntlSND_NCTSGestellungsadresse1.Size = New System.Drawing.Size(549, 118) + Me.UsrCntlSND_NCTSGestellungsadresse1.TabIndex = 0 + ' 'Label43 ' Me.Label43.AutoSize = True @@ -5023,9 +5339,34 @@ Partial Class frmSendungsdetailsNEU Me.Panel2.Location = New System.Drawing.Point(0, 0) Me.Panel2.MaximumSize = New System.Drawing.Size(0, 510) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(1235, 55) + Me.Panel2.Size = New System.Drawing.Size(1235, 65) Me.Panel2.TabIndex = 0 ' + 'FlowLayoutPanel + ' + Me.FlowLayoutPanel.AutoScroll = True + Me.FlowLayoutPanel.Controls.Add(Me.FlatButton2) + Me.FlowLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill + Me.FlowLayoutPanel.Location = New System.Drawing.Point(0, 0) + Me.FlowLayoutPanel.MaximumSize = New System.Drawing.Size(0, 550) + Me.FlowLayoutPanel.Name = "FlowLayoutPanel" + Me.FlowLayoutPanel.Size = New System.Drawing.Size(1123, 65) + Me.FlowLayoutPanel.TabIndex = 0 + ' + 'FlatButton2 + ' + Me.FlatButton2.allowBorder = False + Me.FlatButton2.FlatAppearance.BorderSize = 0 + Me.FlatButton2.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.FlatButton2.ForeColor = System.Drawing.Color.Black + Me.FlatButton2.Location = New System.Drawing.Point(2, 2) + Me.FlatButton2.Margin = New System.Windows.Forms.Padding(2) + Me.FlatButton2.Name = "FlatButton2" + Me.FlatButton2.Size = New System.Drawing.Size(90, 51) + Me.FlatButton2.TabIndex = 0 + Me.FlatButton2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.FlatButton2.UseVisualStyleBackColor = True + ' 'Panel1 ' Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer)) @@ -5036,7 +5377,7 @@ Partial Class frmSendungsdetailsNEU Me.Panel1.Location = New System.Drawing.Point(1123, 0) Me.Panel1.MinimumSize = New System.Drawing.Size(112, 55) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(112, 55) + Me.Panel1.Size = New System.Drawing.Size(112, 65) Me.Panel1.TabIndex = 15 Me.Panel1.TabStop = True ' @@ -5059,7 +5400,7 @@ Partial Class frmSendungsdetailsNEU 'lblSendungen ' Me.lblSendungen.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblSendungen.Location = New System.Drawing.Point(0, 3) + Me.lblSendungen.Location = New System.Drawing.Point(0, 9) Me.lblSendungen.Name = "lblSendungen" Me.lblSendungen.Size = New System.Drawing.Size(112, 34) Me.lblSendungen.TabIndex = 1 @@ -5068,7 +5409,7 @@ Partial Class frmSendungsdetailsNEU ' 'Label3 ' - Me.Label3.Location = New System.Drawing.Point(0, 38) + Me.Label3.Location = New System.Drawing.Point(0, 44) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(112, 16) Me.Label3.TabIndex = 2 @@ -5095,31 +5436,6 @@ Partial Class frmSendungsdetailsNEU Me.Label2.TabIndex = 0 Me.Label2.Text = "Alle Sendungen im Akt:" ' - 'FlowLayoutPanel - ' - Me.FlowLayoutPanel.AutoScroll = True - Me.FlowLayoutPanel.Controls.Add(Me.FlatButton2) - Me.FlowLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill - Me.FlowLayoutPanel.Location = New System.Drawing.Point(0, 0) - Me.FlowLayoutPanel.MaximumSize = New System.Drawing.Size(0, 550) - Me.FlowLayoutPanel.Name = "FlowLayoutPanel" - Me.FlowLayoutPanel.Size = New System.Drawing.Size(1123, 55) - Me.FlowLayoutPanel.TabIndex = 0 - ' - 'FlatButton2 - ' - Me.FlatButton2.allowBorder = False - Me.FlatButton2.FlatAppearance.BorderSize = 0 - Me.FlatButton2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.FlatButton2.ForeColor = System.Drawing.Color.Black - Me.FlatButton2.Location = New System.Drawing.Point(2, 2) - Me.FlatButton2.Margin = New System.Windows.Forms.Padding(2) - Me.FlatButton2.Name = "FlatButton2" - Me.FlatButton2.Size = New System.Drawing.Size(90, 51) - Me.FlatButton2.TabIndex = 0 - Me.FlatButton2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.FlatButton2.UseVisualStyleBackColor = True - ' 'Panel7 ' Me.Panel7.Controls.Add(Me.pnlValidation) @@ -6136,322 +6452,6 @@ Partial Class frmSendungsdetailsNEU Me.DataGridViewTextBoxColumn5.ReadOnly = True Me.DataGridViewTextBoxColumn5.Width = 200 ' - 'RCntrlVermerke1 - ' - Me.RCntrlVermerke1.Dock = System.Windows.Forms.DockStyle.Fill - Me.RCntrlVermerke1.Location = New System.Drawing.Point(0, 0) - Me.RCntrlVermerke1.Name = "RCntrlVermerke1" - Me.RCntrlVermerke1.Size = New System.Drawing.Size(1227, 308) - Me.RCntrlVermerke1.TabIndex = 1 - ' - 'cntlFrachtfuehrer_Sonst - ' - Me.cntlFrachtfuehrer_Sonst._abrArt = "SONST" - Me.cntlFrachtfuehrer_Sonst._beteiligter = "FRACHTF" - Me.cntlFrachtfuehrer_Sonst._readOnly = True - Me.cntlFrachtfuehrer_Sonst.Location = New System.Drawing.Point(632, 168) - Me.cntlFrachtfuehrer_Sonst.Name = "cntlFrachtfuehrer_Sonst" - Me.cntlFrachtfuehrer_Sonst.Size = New System.Drawing.Size(21, 20) - Me.cntlFrachtfuehrer_Sonst.TabIndex = 82 - Me.cntlFrachtfuehrer_Sonst.TabStop = False - Me.cntlFrachtfuehrer_Sonst.value = "" - ' - 'cntlAbsender_Sonst - ' - Me.cntlAbsender_Sonst._abrArt = "SONST" - Me.cntlAbsender_Sonst._beteiligter = "ABS" - Me.cntlAbsender_Sonst._readOnly = True - Me.cntlAbsender_Sonst.Location = New System.Drawing.Point(632, 133) - Me.cntlAbsender_Sonst.Name = "cntlAbsender_Sonst" - Me.cntlAbsender_Sonst.Size = New System.Drawing.Size(21, 20) - Me.cntlAbsender_Sonst.TabIndex = 68 - Me.cntlAbsender_Sonst.TabStop = False - Me.cntlAbsender_Sonst.value = "" - ' - 'cntlEmpfaenger_Sonst - ' - Me.cntlEmpfaenger_Sonst._abrArt = "SONST" - Me.cntlEmpfaenger_Sonst._beteiligter = "EMPF" - Me.cntlEmpfaenger_Sonst._readOnly = True - Me.cntlEmpfaenger_Sonst.Location = New System.Drawing.Point(632, 94) - Me.cntlEmpfaenger_Sonst.Name = "cntlEmpfaenger_Sonst" - Me.cntlEmpfaenger_Sonst.Size = New System.Drawing.Size(21, 20) - Me.cntlEmpfaenger_Sonst.TabIndex = 53 - Me.cntlEmpfaenger_Sonst.TabStop = False - Me.cntlEmpfaenger_Sonst.value = "" - ' - 'cntlAuftraggeber_Sonst - ' - Me.cntlAuftraggeber_Sonst._abrArt = "SONST" - Me.cntlAuftraggeber_Sonst._beteiligter = "AUFTR" - Me.cntlAuftraggeber_Sonst._readOnly = True - Me.cntlAuftraggeber_Sonst.Location = New System.Drawing.Point(632, 57) - Me.cntlAuftraggeber_Sonst.Name = "cntlAuftraggeber_Sonst" - Me.cntlAuftraggeber_Sonst.Size = New System.Drawing.Size(21, 20) - Me.cntlAuftraggeber_Sonst.TabIndex = 36 - Me.cntlAuftraggeber_Sonst.TabStop = False - Me.cntlAuftraggeber_Sonst.value = "" - ' - 'cntlAvisierer_Sonst - ' - Me.cntlAvisierer_Sonst._abrArt = "SONST" - Me.cntlAvisierer_Sonst._beteiligter = "AVISIERER" - Me.cntlAvisierer_Sonst._readOnly = True - Me.cntlAvisierer_Sonst.Location = New System.Drawing.Point(632, 20) - Me.cntlAvisierer_Sonst.Name = "cntlAvisierer_Sonst" - Me.cntlAvisierer_Sonst.Size = New System.Drawing.Size(21, 20) - Me.cntlAvisierer_Sonst.TabIndex = 21 - Me.cntlAvisierer_Sonst.TabStop = False - Me.cntlAvisierer_Sonst.value = "" - ' - 'cntlFrachtf_Clear - ' - Me.cntlFrachtf_Clear._abrArt = "CLEARING" - Me.cntlFrachtf_Clear._beteiligter = "FRACHTF" - Me.cntlFrachtf_Clear._readOnly = False - Me.cntlFrachtf_Clear.Location = New System.Drawing.Point(600, 168) - Me.cntlFrachtf_Clear.Name = "cntlFrachtf_Clear" - Me.cntlFrachtf_Clear.Size = New System.Drawing.Size(21, 20) - Me.cntlFrachtf_Clear.TabIndex = 81 - Me.cntlFrachtf_Clear.TabStop = False - Me.cntlFrachtf_Clear.value = "" - ' - 'cntlFrachtf_Abf - ' - Me.cntlFrachtf_Abf._abrArt = "ABFKOST" - Me.cntlFrachtf_Abf._beteiligter = "FRACHTF" - Me.cntlFrachtf_Abf._readOnly = False - Me.cntlFrachtf_Abf.Location = New System.Drawing.Point(569, 168) - Me.cntlFrachtf_Abf.Name = "cntlFrachtf_Abf" - Me.cntlFrachtf_Abf.Size = New System.Drawing.Size(21, 20) - Me.cntlFrachtf_Abf.TabIndex = 80 - Me.cntlFrachtf_Abf.TabStop = False - Me.cntlFrachtf_Abf.value = "" - ' - 'cntlFrachtf_Eust - ' - Me.cntlFrachtf_Eust._abrArt = "EUST" - Me.cntlFrachtf_Eust._beteiligter = "FRACHTF" - Me.cntlFrachtf_Eust._readOnly = False - Me.cntlFrachtf_Eust.Location = New System.Drawing.Point(538, 168) - Me.cntlFrachtf_Eust.Name = "cntlFrachtf_Eust" - Me.cntlFrachtf_Eust.Size = New System.Drawing.Size(21, 20) - Me.cntlFrachtf_Eust.TabIndex = 79 - Me.cntlFrachtf_Eust.TabStop = False - Me.cntlFrachtf_Eust.value = "" - ' - 'cntlFrachtf_Zoll - ' - Me.cntlFrachtf_Zoll._abrArt = "ZOLL" - Me.cntlFrachtf_Zoll._beteiligter = "FRACHTF" - Me.cntlFrachtf_Zoll._readOnly = False - Me.cntlFrachtf_Zoll.Location = New System.Drawing.Point(507, 168) - Me.cntlFrachtf_Zoll.Name = "cntlFrachtf_Zoll" - Me.cntlFrachtf_Zoll.Size = New System.Drawing.Size(21, 20) - Me.cntlFrachtf_Zoll.TabIndex = 78 - Me.cntlFrachtf_Zoll.TabStop = False - Me.cntlFrachtf_Zoll.value = "" - ' - 'cntlAbsender_Clear - ' - Me.cntlAbsender_Clear._abrArt = "CLEARING" - Me.cntlAbsender_Clear._beteiligter = "ABS" - Me.cntlAbsender_Clear._readOnly = False - Me.cntlAbsender_Clear.Location = New System.Drawing.Point(600, 133) - Me.cntlAbsender_Clear.Name = "cntlAbsender_Clear" - Me.cntlAbsender_Clear.Size = New System.Drawing.Size(21, 20) - Me.cntlAbsender_Clear.TabIndex = 67 - Me.cntlAbsender_Clear.TabStop = False - Me.cntlAbsender_Clear.value = "" - ' - 'cntlAbsender_Abf - ' - Me.cntlAbsender_Abf._abrArt = "ABFKOST" - Me.cntlAbsender_Abf._beteiligter = "ABS" - Me.cntlAbsender_Abf._readOnly = False - Me.cntlAbsender_Abf.Location = New System.Drawing.Point(569, 133) - Me.cntlAbsender_Abf.Name = "cntlAbsender_Abf" - Me.cntlAbsender_Abf.Size = New System.Drawing.Size(21, 20) - Me.cntlAbsender_Abf.TabIndex = 66 - Me.cntlAbsender_Abf.TabStop = False - Me.cntlAbsender_Abf.value = "" - ' - 'cntlAbsender_Eust - ' - Me.cntlAbsender_Eust._abrArt = "EUST" - Me.cntlAbsender_Eust._beteiligter = "ABS" - Me.cntlAbsender_Eust._readOnly = False - Me.cntlAbsender_Eust.Location = New System.Drawing.Point(538, 133) - Me.cntlAbsender_Eust.Name = "cntlAbsender_Eust" - Me.cntlAbsender_Eust.Size = New System.Drawing.Size(21, 20) - Me.cntlAbsender_Eust.TabIndex = 65 - Me.cntlAbsender_Eust.TabStop = False - Me.cntlAbsender_Eust.value = "" - ' - 'cntlAbsender_Zoll - ' - Me.cntlAbsender_Zoll._abrArt = "ZOLL" - Me.cntlAbsender_Zoll._beteiligter = "ABS" - Me.cntlAbsender_Zoll._readOnly = False - Me.cntlAbsender_Zoll.Location = New System.Drawing.Point(507, 133) - Me.cntlAbsender_Zoll.Name = "cntlAbsender_Zoll" - Me.cntlAbsender_Zoll.Size = New System.Drawing.Size(21, 20) - Me.cntlAbsender_Zoll.TabIndex = 64 - Me.cntlAbsender_Zoll.TabStop = False - Me.cntlAbsender_Zoll.value = "" - ' - 'cntlEmpf_Clear - ' - Me.cntlEmpf_Clear._abrArt = "CLEARING" - Me.cntlEmpf_Clear._beteiligter = "EMPF" - Me.cntlEmpf_Clear._readOnly = False - Me.cntlEmpf_Clear.Location = New System.Drawing.Point(600, 94) - Me.cntlEmpf_Clear.Name = "cntlEmpf_Clear" - Me.cntlEmpf_Clear.Size = New System.Drawing.Size(21, 20) - Me.cntlEmpf_Clear.TabIndex = 52 - Me.cntlEmpf_Clear.TabStop = False - Me.cntlEmpf_Clear.value = "" - ' - 'cntlEmpf_Abf - ' - Me.cntlEmpf_Abf._abrArt = "ABFKOST" - Me.cntlEmpf_Abf._beteiligter = "EMPF" - Me.cntlEmpf_Abf._readOnly = False - Me.cntlEmpf_Abf.Location = New System.Drawing.Point(569, 94) - Me.cntlEmpf_Abf.Name = "cntlEmpf_Abf" - Me.cntlEmpf_Abf.Size = New System.Drawing.Size(21, 20) - Me.cntlEmpf_Abf.TabIndex = 51 - Me.cntlEmpf_Abf.TabStop = False - Me.cntlEmpf_Abf.value = "" - ' - 'cntlEmpf_Eust - ' - Me.cntlEmpf_Eust._abrArt = "EUST" - Me.cntlEmpf_Eust._beteiligter = "EMPF" - Me.cntlEmpf_Eust._readOnly = False - Me.cntlEmpf_Eust.Location = New System.Drawing.Point(538, 94) - Me.cntlEmpf_Eust.Name = "cntlEmpf_Eust" - Me.cntlEmpf_Eust.Size = New System.Drawing.Size(21, 20) - Me.cntlEmpf_Eust.TabIndex = 50 - Me.cntlEmpf_Eust.TabStop = False - Me.cntlEmpf_Eust.value = "" - ' - 'cntlEmpf_Zoll - ' - Me.cntlEmpf_Zoll._abrArt = "ZOLL" - Me.cntlEmpf_Zoll._beteiligter = "EMPF" - Me.cntlEmpf_Zoll._readOnly = False - Me.cntlEmpf_Zoll.Location = New System.Drawing.Point(507, 94) - Me.cntlEmpf_Zoll.Name = "cntlEmpf_Zoll" - Me.cntlEmpf_Zoll.Size = New System.Drawing.Size(21, 20) - Me.cntlEmpf_Zoll.TabIndex = 49 - Me.cntlEmpf_Zoll.TabStop = False - Me.cntlEmpf_Zoll.value = "" - ' - 'cntlAuftr_Clear - ' - Me.cntlAuftr_Clear._abrArt = "CLEARING" - Me.cntlAuftr_Clear._beteiligter = "AUFTR" - Me.cntlAuftr_Clear._readOnly = False - Me.cntlAuftr_Clear.Location = New System.Drawing.Point(600, 57) - Me.cntlAuftr_Clear.Name = "cntlAuftr_Clear" - Me.cntlAuftr_Clear.Size = New System.Drawing.Size(21, 20) - Me.cntlAuftr_Clear.TabIndex = 35 - Me.cntlAuftr_Clear.TabStop = False - Me.cntlAuftr_Clear.value = "" - ' - 'cntlAuftr_Abf - ' - Me.cntlAuftr_Abf._abrArt = "ABFKOST" - Me.cntlAuftr_Abf._beteiligter = "AUFTR" - Me.cntlAuftr_Abf._readOnly = False - Me.cntlAuftr_Abf.Location = New System.Drawing.Point(569, 57) - Me.cntlAuftr_Abf.Name = "cntlAuftr_Abf" - Me.cntlAuftr_Abf.Size = New System.Drawing.Size(21, 20) - Me.cntlAuftr_Abf.TabIndex = 34 - Me.cntlAuftr_Abf.TabStop = False - Me.cntlAuftr_Abf.value = "" - ' - 'cntlAuftr_Eust - ' - Me.cntlAuftr_Eust._abrArt = "EUST" - Me.cntlAuftr_Eust._beteiligter = "AUFTR" - Me.cntlAuftr_Eust._readOnly = False - Me.cntlAuftr_Eust.Location = New System.Drawing.Point(538, 57) - Me.cntlAuftr_Eust.Name = "cntlAuftr_Eust" - Me.cntlAuftr_Eust.Size = New System.Drawing.Size(21, 20) - Me.cntlAuftr_Eust.TabIndex = 33 - Me.cntlAuftr_Eust.TabStop = False - Me.cntlAuftr_Eust.value = "" - ' - 'cntlAuftr_Zoll - ' - Me.cntlAuftr_Zoll._abrArt = "ZOLL" - Me.cntlAuftr_Zoll._beteiligter = "AUFTR" - Me.cntlAuftr_Zoll._readOnly = False - Me.cntlAuftr_Zoll.Location = New System.Drawing.Point(507, 57) - Me.cntlAuftr_Zoll.Name = "cntlAuftr_Zoll" - Me.cntlAuftr_Zoll.Size = New System.Drawing.Size(21, 20) - Me.cntlAuftr_Zoll.TabIndex = 32 - Me.cntlAuftr_Zoll.TabStop = False - Me.cntlAuftr_Zoll.value = "" - ' - 'cntlAvisierer_Clear - ' - Me.cntlAvisierer_Clear._abrArt = "CLEARING" - Me.cntlAvisierer_Clear._beteiligter = "AVISIERER" - Me.cntlAvisierer_Clear._readOnly = False - Me.cntlAvisierer_Clear.Location = New System.Drawing.Point(600, 20) - Me.cntlAvisierer_Clear.Name = "cntlAvisierer_Clear" - Me.cntlAvisierer_Clear.Size = New System.Drawing.Size(21, 20) - Me.cntlAvisierer_Clear.TabIndex = 20 - Me.cntlAvisierer_Clear.TabStop = False - Me.cntlAvisierer_Clear.value = "" - ' - 'cntlAvisierer_Abf - ' - Me.cntlAvisierer_Abf._abrArt = "ABFKOST" - Me.cntlAvisierer_Abf._beteiligter = "AVISIERER" - Me.cntlAvisierer_Abf._readOnly = False - Me.cntlAvisierer_Abf.Location = New System.Drawing.Point(569, 20) - Me.cntlAvisierer_Abf.Name = "cntlAvisierer_Abf" - Me.cntlAvisierer_Abf.Size = New System.Drawing.Size(21, 20) - Me.cntlAvisierer_Abf.TabIndex = 19 - Me.cntlAvisierer_Abf.TabStop = False - Me.cntlAvisierer_Abf.value = "" - ' - 'cntlAvisierer_Eust - ' - Me.cntlAvisierer_Eust._abrArt = "EUST" - Me.cntlAvisierer_Eust._beteiligter = "AVISIERER" - Me.cntlAvisierer_Eust._readOnly = False - Me.cntlAvisierer_Eust.Location = New System.Drawing.Point(538, 20) - Me.cntlAvisierer_Eust.Name = "cntlAvisierer_Eust" - Me.cntlAvisierer_Eust.Size = New System.Drawing.Size(21, 20) - Me.cntlAvisierer_Eust.TabIndex = 18 - Me.cntlAvisierer_Eust.TabStop = False - Me.cntlAvisierer_Eust.value = "" - ' - 'cntlAvisierer_Zoll - ' - Me.cntlAvisierer_Zoll._abrArt = "ZOLL" - Me.cntlAvisierer_Zoll._beteiligter = "AVISIERER" - Me.cntlAvisierer_Zoll._readOnly = False - Me.cntlAvisierer_Zoll.Location = New System.Drawing.Point(507, 20) - Me.cntlAvisierer_Zoll.Name = "cntlAvisierer_Zoll" - Me.cntlAvisierer_Zoll.Size = New System.Drawing.Size(21, 20) - Me.cntlAvisierer_Zoll.TabIndex = 17 - Me.cntlAvisierer_Zoll.TabStop = False - Me.cntlAvisierer_Zoll.value = "" - ' - 'UsrCntlSND_NCTSGestellungsadresse1 - ' - Me.UsrCntlSND_NCTSGestellungsadresse1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlSND_NCTSGestellungsadresse1.Location = New System.Drawing.Point(0, 0) - Me.UsrCntlSND_NCTSGestellungsadresse1.Name = "UsrCntlSND_NCTSGestellungsadresse1" - Me.UsrCntlSND_NCTSGestellungsadresse1.Size = New System.Drawing.Size(549, 118) - Me.UsrCntlSND_NCTSGestellungsadresse1.TabIndex = 0 - ' 'frmSendungsdetailsNEU ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -6547,10 +6547,10 @@ Partial Class frmSendungsdetailsNEU Me.pnlFremd.ResumeLayout(False) Me.pnlFremd.PerformLayout() Me.Panel2.ResumeLayout(False) + Me.FlowLayoutPanel.ResumeLayout(False) Me.Panel1.ResumeLayout(False) Me.pnlheader.ResumeLayout(False) Me.pnlheader.PerformLayout() - Me.FlowLayoutPanel.ResumeLayout(False) Me.Panel7.ResumeLayout(False) Me.Panel7.PerformLayout() Me.pnlValidation.ResumeLayout(False) diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index f484919..da8686c 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -1099,12 +1099,21 @@ Public Class frmSendungsdetailsNEU b.lblAbfBez.ForeColor = IIf(b.value = pos, VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_ForeColor, Color.Black) b.lblAuftr.ForeColor = IIf(b.value = pos, VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_ForeColor, Color.Black) b.lblNr.ForeColor = IIf(b.value = pos, VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_ForeColor, Color.Black) + b.lblColliWeight.BackColor = IIf(b.value = pos, Color.FromArgb(0, 34, 98), Color.DarkGray) + b.lblColliWeight.ForeColor = IIf(b.value = pos, VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_ForeColor, Color.Black) ' Dim r As DataRow = AVISO_newDataSet.tblSendungen.Rows(b.value) ' MsgBox(da("tblSnd_PosUnterNr") & ". ") b.lblNr.Text = SENDUNG_LIST(b.value).tblSnd_PosUnterNr & ". " b.lblAbfBez.Text = ADMIN.getValueTxtBySql("SELECT Abfertigungsbezeichnung FROM Abfertigungsarten WHERE [Abfertigungsart]='" & SENDUNG_LIST(b.value).tblSnd_Abfertigungsart_ID & "'", "FMZOLL") b.lblAuftr.Text = loadValue(SENDUNG_LIST(b.value).tblSnd_Empfaenger, "") + b.lblColliWeight.Text = "" + + If SENDUNG_LIST(b.value).tblSnd_Colli IsNot Nothing AndAlso IsNumeric(SENDUNG_LIST(b.value).tblSnd_Colli) Then b.lblColliWeight.Text = CDbl(SENDUNG_LIST(b.value).tblSnd_Colli).ToString("N0") & " Pk" + If SENDUNG_LIST(b.value).tblSnd_Gewicht IsNot Nothing AndAlso IsNumeric(SENDUNG_LIST(b.value).tblSnd_Gewicht) Then + b.lblColliWeight.Text &= If(b.lblColliWeight.Text <> "", "/", "") & CDbl(SENDUNG_LIST(b.value).tblSnd_Gewicht).ToString("N0") & " kg" + End If + 'End If End If @@ -1975,7 +1984,7 @@ Public Class frmSendungsdetailsNEU If SENDUNG_LIST(CURRENT_INDEX).tblSnd_SpeditionsbuchEingetragen Then btnSpeditionsbuchEintragen.BackgroundImage = My.Resources.speditionsbuchAktiv - setTooltioBtn(btnSpeditionsbuchEintragen, "Status 'Speditionsbuch Eingetragen' entfernen") + setTooltioBtn(btnSpeditionsbuchEintragen, "Speditionsbuch Eingetrag öffnen") End If @@ -8137,7 +8146,7 @@ Public Class frmSendungsdetailsNEU Private Sub btnStatusAbklaerungTR_Click(sender As Object, e As EventArgs) Handles btnStatusAbklaerungTR.Click Me.Cursor = Cursors.WaitCursor - If AVISOFUNC.setSendungAbklaerungTR(SendungsId, AvisoId) Then + If AVISOFUNC.setSendungAbklaerungTR(SendungID, AvisoId) Then initDataBinding() End If Me.Cursor = Cursors.Default @@ -8145,7 +8154,7 @@ Public Class frmSendungsdetailsNEU Private Sub btnStatusVorbereitetQS_Click(sender As Object, e As EventArgs) Handles btnStatusVorbereitetQS.Click Me.Cursor = Cursors.WaitCursor - If AVISOFUNC.setSendungVorbereitetQS(SendungsId, AvisoId) Then + If AVISOFUNC.setSendungVorbereitetQS(SendungID, AvisoId) Then initDataBinding() End If Me.Cursor = Cursors.Default @@ -8153,7 +8162,7 @@ Public Class frmSendungsdetailsNEU Private Sub btnStatusVorgeschrieben_Click(sender As Object, e As EventArgs) Handles btnStatusVorgeschrieben.Click Me.Cursor = Cursors.WaitCursor - If AVISOFUNC.setSendungVorgeschrieben(SendungsId, AvisoId) Then + If AVISOFUNC.setSendungVorgeschrieben(SendungID, AvisoId) Then initDataBinding() End If Me.Cursor = Cursors.Default @@ -8161,7 +8170,7 @@ Public Class frmSendungsdetailsNEU Private Sub btnStatusAbfertigungTR_Click(sender As Object, e As EventArgs) Handles btnStatusAbfertigungTR.Click Me.Cursor = Cursors.WaitCursor - If AVISOFUNC.setSendungAbfertigungTR(SendungsId, AvisoId) Then + If AVISOFUNC.setSendungAbfertigungTR(SendungID, AvisoId) Then initDataBinding() End If Me.Cursor = Cursors.Default @@ -8170,7 +8179,7 @@ Public Class frmSendungsdetailsNEU Private Sub btnSpeditionsbuchEintragen_Click(sender As Object, e As EventArgs) Handles btnSpeditionsbuchEintragen.Click Me.Cursor = Cursors.WaitCursor If Not cbxFremdspedition.Checked Then - If AVISOFUNC.setSendungFakturiert(SendungsId, AvisoId) Then + If AVISOFUNC.setSendungSpeditionsbuchEintrag(SendungID, AvisoId) Then initDataBinding() End If End If @@ -8179,7 +8188,7 @@ Public Class frmSendungsdetailsNEU Private Sub btnSendungFakturiert_Click(sender As Object, e As EventArgs) Handles btnSendungFakturiert.Click Me.Cursor = Cursors.WaitCursor - If AVISOFUNC.setSendungFakturiert(SendungsId, AvisoId) Then + If AVISOFUNC.setSendungFakturiert(SendungID, AvisoId) Then initDataBinding() End If Me.Cursor = Cursors.Default diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index 84cab1a..f02d7b9 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -1346,7 +1346,7 @@ Public Class usrcntlAktDetails End If End If - Else + Else If Not existCodeInGridVermerke_VK_OLD(gridvermerke, r.Cells("SendungID").Value) Then optionCell.Value = paarBez optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk '" & paarBez & "' einzutragen."