diff --git a/Aviso/frmSendungsdetailsNEU.Designer.vb b/Aviso/frmSendungsdetailsNEU.Designer.vb index 4ddc28e..23eec6b 100644 --- a/Aviso/frmSendungsdetailsNEU.Designer.vb +++ b/Aviso/frmSendungsdetailsNEU.Designer.vb @@ -670,7 +670,7 @@ Partial Class frmSendungsdetailsNEU Me.tbAnhang.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.tbAnhang.Location = New System.Drawing.Point(4, 29) Me.tbAnhang.Name = "tbAnhang" - Me.tbAnhang.Size = New System.Drawing.Size(1227, 308) + Me.tbAnhang.Size = New System.Drawing.Size(1227, 298) Me.tbAnhang.TabIndex = 4 Me.tbAnhang.Text = "Anhang" Me.tbAnhang.UseVisualStyleBackColor = True @@ -691,7 +691,7 @@ Partial Class frmSendungsdetailsNEU Me.dgvAnhang.RowHeadersWidth = 51 Me.dgvAnhang.RowTemplate.Height = 40 Me.dgvAnhang.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvAnhang.Size = New System.Drawing.Size(1227, 245) + Me.dgvAnhang.Size = New System.Drawing.Size(1227, 235) Me.dgvAnhang.TabIndex = 1 ' 'btnDirektAnfuegen @@ -932,7 +932,7 @@ Partial Class frmSendungsdetailsNEU Me.tbZollabfertigung.Controls.Add(Me.Panel16) Me.tbZollabfertigung.Location = New System.Drawing.Point(4, 29) Me.tbZollabfertigung.Name = "tbZollabfertigung" - Me.tbZollabfertigung.Size = New System.Drawing.Size(1227, 308) + Me.tbZollabfertigung.Size = New System.Drawing.Size(1227, 298) Me.tbZollabfertigung.TabIndex = 2 Me.tbZollabfertigung.Text = "Zollabfertigung" Me.tbZollabfertigung.UseVisualStyleBackColor = True @@ -946,7 +946,7 @@ Partial Class frmSendungsdetailsNEU Me.Panel16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.Panel16.Location = New System.Drawing.Point(0, 0) Me.Panel16.Name = "Panel16" - Me.Panel16.Size = New System.Drawing.Size(1227, 308) + Me.Panel16.Size = New System.Drawing.Size(1227, 298) Me.Panel16.TabIndex = 0 ' 'dgvZollAnmeldungen @@ -964,7 +964,7 @@ Partial Class frmSendungsdetailsNEU Me.dgvZollAnmeldungen.RowHeadersWidth = 51 Me.dgvZollAnmeldungen.RowTemplate.Height = 30 Me.dgvZollAnmeldungen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvZollAnmeldungen.Size = New System.Drawing.Size(1227, 238) + Me.dgvZollAnmeldungen.Size = New System.Drawing.Size(1227, 228) Me.dgvZollAnmeldungen.TabIndex = 1 ' 'Panel17 @@ -973,7 +973,7 @@ Partial Class frmSendungsdetailsNEU Me.Panel17.Controls.Add(Me.Button6) Me.Panel17.Controls.Add(Me.Button5) Me.Panel17.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel17.Location = New System.Drawing.Point(0, 270) + Me.Panel17.Location = New System.Drawing.Point(0, 260) Me.Panel17.Name = "Panel17" Me.Panel17.Size = New System.Drawing.Size(1227, 38) Me.Panel17.TabIndex = 2 @@ -1209,7 +1209,7 @@ Partial Class frmSendungsdetailsNEU Me.tbATEZ.Location = New System.Drawing.Point(4, 29) Me.tbATEZ.Name = "tbATEZ" Me.tbATEZ.Padding = New System.Windows.Forms.Padding(3) - Me.tbATEZ.Size = New System.Drawing.Size(1227, 308) + Me.tbATEZ.Size = New System.Drawing.Size(1227, 298) Me.tbATEZ.TabIndex = 6 Me.tbATEZ.Text = "ATEZ" Me.tbATEZ.UseVisualStyleBackColor = True @@ -1249,7 +1249,7 @@ Partial Class frmSendungsdetailsNEU Me.dgvATEZNCTS.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvATEZNCTS.ShowCellErrors = False Me.dgvATEZNCTS.ShowRowErrors = False - Me.dgvATEZNCTS.Size = New System.Drawing.Size(1221, 232) + Me.dgvATEZNCTS.Size = New System.Drawing.Size(1221, 222) Me.dgvATEZNCTS.TabIndex = 105 Me.dgvATEZNCTS.TabStop = False ' @@ -1325,7 +1325,7 @@ Partial Class frmSendungsdetailsNEU Me.TabPage1.Location = New System.Drawing.Point(4, 29) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(1227, 308) + Me.TabPage1.Size = New System.Drawing.Size(1227, 298) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Kunden - Zolltarif" Me.TabPage1.UseVisualStyleBackColor = True @@ -1341,7 +1341,7 @@ Partial Class frmSendungsdetailsNEU Me.pnlKundenZolltarif.Location = New System.Drawing.Point(3, 36) Me.pnlKundenZolltarif.MinimumSize = New System.Drawing.Size(2, 103) Me.pnlKundenZolltarif.Name = "pnlKundenZolltarif" - Me.pnlKundenZolltarif.Size = New System.Drawing.Size(1221, 269) + Me.pnlKundenZolltarif.Size = New System.Drawing.Size(1221, 259) Me.pnlKundenZolltarif.TabIndex = 1 Me.pnlKundenZolltarif.TabStop = True ' @@ -1350,7 +1350,7 @@ Partial Class frmSendungsdetailsNEU Me.Label22.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label22.AutoSize = True - Me.Label22.Location = New System.Drawing.Point(4, 228) + Me.Label22.Location = New System.Drawing.Point(4, 218) Me.Label22.Name = "Label22" Me.Label22.Size = New System.Drawing.Size(209, 13) Me.Label22.TabIndex = 0 @@ -1362,7 +1362,7 @@ Partial Class frmSendungsdetailsNEU Me.lblBitteEinenEmpfangerAuswahlenUmDenKundenZolltarifEinzublenden.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblBitteEinenEmpfangerAuswahlenUmDenKundenZolltarifEinzublenden.AutoSize = True - Me.lblBitteEinenEmpfangerAuswahlenUmDenKundenZolltarifEinzublenden.Location = New System.Drawing.Point(4, 243) + Me.lblBitteEinenEmpfangerAuswahlenUmDenKundenZolltarifEinzublenden.Location = New System.Drawing.Point(4, 233) Me.lblBitteEinenEmpfangerAuswahlenUmDenKundenZolltarifEinzublenden.Name = "lblBitteEinenEmpfangerAuswahlenUmDenKundenZolltarifEinzublenden" Me.lblBitteEinenEmpfangerAuswahlenUmDenKundenZolltarifEinzublenden.Size = New System.Drawing.Size(338, 13) Me.lblBitteEinenEmpfangerAuswahlenUmDenKundenZolltarifEinzublenden.TabIndex = 1 @@ -1408,7 +1408,7 @@ Partial Class frmSendungsdetailsNEU Me.TabPage2.Location = New System.Drawing.Point(4, 29) Me.TabPage2.Name = "TabPage2" Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(1227, 308) + Me.TabPage2.Size = New System.Drawing.Size(1227, 298) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Speditionsbuch" Me.TabPage2.UseVisualStyleBackColor = True @@ -1426,7 +1426,7 @@ Partial Class frmSendungsdetailsNEU Me.DataGridView.Location = New System.Drawing.Point(3, 94) Me.DataGridView.Name = "DataGridView" Me.DataGridView.RowHeadersWidth = 51 - Me.DataGridView.Size = New System.Drawing.Size(1221, 211) + Me.DataGridView.Size = New System.Drawing.Size(1221, 201) Me.DataGridView.TabIndex = 1 ' 'pnlSpedBuchNacherfassung @@ -1741,7 +1741,7 @@ Partial Class frmSendungsdetailsNEU Me.TabPage3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.TabPage3.Location = New System.Drawing.Point(4, 29) Me.TabPage3.Name = "TabPage3" - Me.TabPage3.Size = New System.Drawing.Size(1227, 308) + Me.TabPage3.Size = New System.Drawing.Size(1227, 298) Me.TabPage3.TabIndex = 3 Me.TabPage3.Text = "Vermerke" Me.TabPage3.UseVisualStyleBackColor = True @@ -1751,7 +1751,7 @@ Partial Class frmSendungsdetailsNEU 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.Size = New System.Drawing.Size(1227, 298) Me.RCntrlVermerke1.TabIndex = 1 ' 'gridVermerke @@ -1789,7 +1789,7 @@ Partial Class frmSendungsdetailsNEU Me.gridVermerke.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.gridVermerke.ShowCellErrors = False Me.gridVermerke.ShowRowErrors = False - Me.gridVermerke.Size = New System.Drawing.Size(1227, 308) + Me.gridVermerke.Size = New System.Drawing.Size(1227, 298) Me.gridVermerke.TabIndex = 0 Me.gridVermerke.TabStop = False ' @@ -1799,7 +1799,7 @@ Partial Class frmSendungsdetailsNEU Me.tbDigicust.Controls.Add(Me.Panel24) Me.tbDigicust.Location = New System.Drawing.Point(4, 29) Me.tbDigicust.Name = "tbDigicust" - Me.tbDigicust.Size = New System.Drawing.Size(1227, 308) + Me.tbDigicust.Size = New System.Drawing.Size(1227, 298) Me.tbDigicust.TabIndex = 7 Me.tbDigicust.Text = "Digicust" Me.tbDigicust.UseVisualStyleBackColor = True @@ -1839,7 +1839,7 @@ Partial Class frmSendungsdetailsNEU Me.dgvDigicust.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvDigicust.ShowCellErrors = False Me.dgvDigicust.ShowRowErrors = False - Me.dgvDigicust.Size = New System.Drawing.Size(1227, 263) + Me.dgvDigicust.Size = New System.Drawing.Size(1227, 253) Me.dgvDigicust.TabIndex = 107 Me.dgvDigicust.TabStop = False ' @@ -1874,7 +1874,7 @@ Partial Class frmSendungsdetailsNEU Me.tbMail.Location = New System.Drawing.Point(4, 29) Me.tbMail.Name = "tbMail" Me.tbMail.Padding = New System.Windows.Forms.Padding(3) - Me.tbMail.Size = New System.Drawing.Size(1227, 308) + Me.tbMail.Size = New System.Drawing.Size(1227, 298) Me.tbMail.TabIndex = 8 Me.tbMail.Text = "Mail" Me.tbMail.UseVisualStyleBackColor = True @@ -1915,7 +1915,7 @@ Partial Class frmSendungsdetailsNEU Me.dgvMail.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvMail.ShowCellErrors = False Me.dgvMail.ShowRowErrors = False - Me.dgvMail.Size = New System.Drawing.Size(1221, 257) + Me.dgvMail.Size = New System.Drawing.Size(1221, 247) Me.dgvMail.TabIndex = 109 Me.dgvMail.TabStop = False ' @@ -2108,7 +2108,7 @@ Partial Class frmSendungsdetailsNEU Me.lblZuKass.AutoSize = True Me.lblZuKass.Location = New System.Drawing.Point(29, 2) Me.lblZuKass.Name = "lblZuKass" - Me.lblZuKass.Size = New System.Drawing.Size(103, 13) + Me.lblZuKass.Size = New System.Drawing.Size(100, 13) Me.lblZuKass.TabIndex = 0 Me.lblZuKass.Text = "zu kassieren (BAR):" ' @@ -2142,7 +2142,7 @@ Partial Class frmSendungsdetailsNEU Me.Label12.AutoSize = True Me.Label12.Location = New System.Drawing.Point(266, 7) Me.Label12.Name = "Label12" - Me.Label12.Size = New System.Drawing.Size(42, 13) + Me.Label12.Size = New System.Drawing.Size(40, 13) Me.Label12.TabIndex = 64 Me.Label12.Text = "Fracht:" ' @@ -2185,7 +2185,7 @@ Partial Class frmSendungsdetailsNEU Me.txtFrachtkostenGesamt.MaxLines_Warning = "" Me.txtFrachtkostenGesamt.MaxLines_Warning_Label = Nothing Me.txtFrachtkostenGesamt.Name = "txtFrachtkostenGesamt" - Me.txtFrachtkostenGesamt.Size = New System.Drawing.Size(50, 22) + Me.txtFrachtkostenGesamt.Size = New System.Drawing.Size(50, 20) Me.txtFrachtkostenGesamt.TabIndex = 61 Me.txtFrachtkostenGesamt.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' @@ -2227,7 +2227,7 @@ Partial Class frmSendungsdetailsNEU Me.txtFrachtkostenNichtEU.MaxLines_Warning = "" Me.txtFrachtkostenNichtEU.MaxLines_Warning_Label = Nothing Me.txtFrachtkostenNichtEU.Name = "txtFrachtkostenNichtEU" - Me.txtFrachtkostenNichtEU.Size = New System.Drawing.Size(54, 22) + Me.txtFrachtkostenNichtEU.Size = New System.Drawing.Size(54, 20) Me.txtFrachtkostenNichtEU.TabIndex = 14 Me.txtFrachtkostenNichtEU.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' @@ -2251,7 +2251,7 @@ Partial Class frmSendungsdetailsNEU Me.txtFrachtkostenEU.MaxLines_Warning = "" Me.txtFrachtkostenEU.MaxLines_Warning_Label = Nothing Me.txtFrachtkostenEU.Name = "txtFrachtkostenEU" - Me.txtFrachtkostenEU.Size = New System.Drawing.Size(54, 22) + Me.txtFrachtkostenEU.Size = New System.Drawing.Size(54, 20) Me.txtFrachtkostenEU.TabIndex = 12 Me.txtFrachtkostenEU.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' @@ -2260,7 +2260,7 @@ Partial Class frmSendungsdetailsNEU Me.cbx.AutoSize = True Me.cbx.Location = New System.Drawing.Point(374, 121) Me.cbx.Name = "cbx" - Me.cbx.Size = New System.Drawing.Size(56, 17) + Me.cbx.Size = New System.Drawing.Size(55, 17) Me.cbx.TabIndex = 23 Me.cbx.Text = "Laufz." Me.cbx.UseVisualStyleBackColor = True @@ -2283,7 +2283,7 @@ Partial Class frmSendungsdetailsNEU Me.txtWarenwertWaehrung.Location = New System.Drawing.Point(207, 77) Me.txtWarenwertWaehrung.Name = "txtWarenwertWaehrung" Me.txtWarenwertWaehrung.searchActive = True - Me.txtWarenwertWaehrung.Size = New System.Drawing.Size(51, 22) + Me.txtWarenwertWaehrung.Size = New System.Drawing.Size(51, 20) Me.txtWarenwertWaehrung.SQL_ORDER_BY = Nothing Me.txtWarenwertWaehrung.SQL_SELECT = Nothing Me.txtWarenwertWaehrung.SQL_WHERE = Nothing @@ -2296,7 +2296,7 @@ Partial Class frmSendungsdetailsNEU Me.lblWW.AutoSize = True Me.lblWW.Location = New System.Drawing.Point(4, 80) Me.lblWW.Name = "lblWW" - Me.lblWW.Size = New System.Drawing.Size(67, 13) + Me.lblWW.Size = New System.Drawing.Size(62, 13) Me.lblWW.TabIndex = 9 Me.lblWW.Text = "Warenwert:" ' @@ -2320,7 +2320,7 @@ Partial Class frmSendungsdetailsNEU Me.txtWarenwert.MaxLines_Warning = "" Me.txtWarenwert.MaxLines_Warning_Label = Nothing Me.txtWarenwert.Name = "txtWarenwert" - Me.txtWarenwert.Size = New System.Drawing.Size(130, 22) + Me.txtWarenwert.Size = New System.Drawing.Size(130, 20) Me.txtWarenwert.TabIndex = 10 Me.txtWarenwert.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' @@ -2344,7 +2344,7 @@ Partial Class frmSendungsdetailsNEU Me.lblAnmerkungDispoliste.AutoSize = True Me.lblAnmerkungDispoliste.Location = New System.Drawing.Point(3, 254) Me.lblAnmerkungDispoliste.Name = "lblAnmerkungDispoliste" - Me.lblAnmerkungDispoliste.Size = New System.Drawing.Size(124, 13) + Me.lblAnmerkungDispoliste.Size = New System.Drawing.Size(112, 13) Me.lblAnmerkungDispoliste.TabIndex = 26 Me.lblAnmerkungDispoliste.Text = "Anmerkung Dispoliste:" ' @@ -2401,7 +2401,7 @@ Partial Class frmSendungsdetailsNEU Me.txtGewicht.MaxLines_Warning = "" Me.txtGewicht.MaxLines_Warning_Label = Nothing Me.txtGewicht.Name = "txtGewicht" - Me.txtGewicht.Size = New System.Drawing.Size(69, 22) + Me.txtGewicht.Size = New System.Drawing.Size(69, 20) Me.txtGewicht.TabIndex = 4 Me.txtGewicht.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' @@ -2418,7 +2418,7 @@ Partial Class frmSendungsdetailsNEU Me.Label35.AutoSize = True Me.Label35.Location = New System.Drawing.Point(295, 64) Me.Label35.Name = "Label35" - Me.Label35.Size = New System.Drawing.Size(137, 13) + Me.Label35.Size = New System.Drawing.Size(131, 13) Me.Label35.TabIndex = 18 Me.Label35.Text = "Aktenzettel drucken/PDF:" ' @@ -2427,7 +2427,7 @@ Partial Class frmSendungsdetailsNEU Me.lblCollGew.AutoSize = True Me.lblCollGew.Location = New System.Drawing.Point(3, 5) Me.lblCollGew.Name = "lblCollGew" - Me.lblCollGew.Size = New System.Drawing.Size(184, 13) + Me.lblCollGew.Size = New System.Drawing.Size(171, 13) Me.lblCollGew.TabIndex = 0 Me.lblCollGew.Text = "Colli/Gewicht/Warenbezeichnung:" ' @@ -2472,7 +2472,7 @@ Partial Class frmSendungsdetailsNEU Me.txtColli.MaxLines_Warning = "" Me.txtColli.MaxLines_Warning_Label = Nothing Me.txtColli.Name = "txtColli" - Me.txtColli.Size = New System.Drawing.Size(46, 22) + Me.txtColli.Size = New System.Drawing.Size(46, 20) Me.txtColli.TabIndex = 3 Me.txtColli.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' @@ -2491,7 +2491,7 @@ Partial Class frmSendungsdetailsNEU Me.Label23.AutoSize = True Me.Label23.Location = New System.Drawing.Point(52, 25) Me.Label23.Name = "Label23" - Me.Label23.Size = New System.Drawing.Size(22, 13) + Me.Label23.Size = New System.Drawing.Size(23, 13) Me.Label23.TabIndex = 1 Me.Label23.Text = "Pk." ' @@ -2500,7 +2500,7 @@ Partial Class frmSendungsdetailsNEU Me.Label24.AutoSize = True Me.Label24.Location = New System.Drawing.Point(152, 25) Me.Label24.Name = "Label24" - Me.Label24.Size = New System.Drawing.Size(20, 13) + Me.Label24.Size = New System.Drawing.Size(19, 13) Me.Label24.TabIndex = 5 Me.Label24.Text = "kg" ' @@ -2509,7 +2509,7 @@ Partial Class frmSendungsdetailsNEU Me.lblAnmerkung.AutoSize = True Me.lblAnmerkung.Location = New System.Drawing.Point(6, 112) Me.lblAnmerkung.Name = "lblAnmerkung" - Me.lblAnmerkung.Size = New System.Drawing.Size(70, 13) + Me.lblAnmerkung.Size = New System.Drawing.Size(64, 13) Me.lblAnmerkung.TabIndex = 17 Me.lblAnmerkung.Text = "Anmerkung:" ' @@ -2926,7 +2926,7 @@ Partial Class frmSendungsdetailsNEU Me.txtVK_Preis.MaxLines_Warning = "" Me.txtVK_Preis.MaxLines_Warning_Label = Nothing Me.txtVK_Preis.Name = "txtVK_Preis" - Me.txtVK_Preis.Size = New System.Drawing.Size(75, 22) + Me.txtVK_Preis.Size = New System.Drawing.Size(75, 20) Me.txtVK_Preis.TabIndex = 4 ' 'txtVK_Leistung @@ -2950,7 +2950,7 @@ Partial Class frmSendungsdetailsNEU Me.txtVK_Leistung.MaxLines_Warning = "" Me.txtVK_Leistung.MaxLines_Warning_Label = Nothing Me.txtVK_Leistung.Name = "txtVK_Leistung" - Me.txtVK_Leistung.Size = New System.Drawing.Size(127, 22) + Me.txtVK_Leistung.Size = New System.Drawing.Size(127, 20) Me.txtVK_Leistung.TabIndex = 2 ' 'txtVK_Firma @@ -2974,7 +2974,7 @@ Partial Class frmSendungsdetailsNEU Me.txtVK_Firma.MaxLines_Warning = "" Me.txtVK_Firma.MaxLines_Warning_Label = Nothing Me.txtVK_Firma.Name = "txtVK_Firma" - Me.txtVK_Firma.Size = New System.Drawing.Size(127, 22) + Me.txtVK_Firma.Size = New System.Drawing.Size(127, 20) Me.txtVK_Firma.TabIndex = 1 ' 'dgvVorkosten @@ -3167,7 +3167,7 @@ Partial Class frmSendungsdetailsNEU Me.Label13.AutoSize = True Me.Label13.Location = New System.Drawing.Point(552, 293) Me.Label13.Name = "Label13" - Me.Label13.Size = New System.Drawing.Size(40, 13) + Me.Label13.Size = New System.Drawing.Size(42, 13) Me.Label13.TabIndex = 96 Me.Label13.Text = "ATA-Nr" Me.Label13.Visible = False @@ -3207,7 +3207,7 @@ Partial Class frmSendungsdetailsNEU Me.txtFrachtfuehrer.Name = "txtFrachtfuehrer" Me.txtFrachtfuehrer.nurAktive = False Me.txtFrachtfuehrer.searchActive = True - Me.txtFrachtfuehrer.Size = New System.Drawing.Size(245, 22) + Me.txtFrachtfuehrer.Size = New System.Drawing.Size(245, 20) Me.txtFrachtfuehrer.TabIndex = 75 Me.txtFrachtfuehrer.TIMER_SEARCH = True Me.txtFrachtfuehrer.usrcntl = Nothing @@ -3478,7 +3478,7 @@ Partial Class frmSendungsdetailsNEU Me.txtKdAuftragsNrFrachtfuehrer.MaxLines_Warning = "" Me.txtKdAuftragsNrFrachtfuehrer.MaxLines_Warning_Label = Nothing Me.txtKdAuftragsNrFrachtfuehrer.Name = "txtKdAuftragsNrFrachtfuehrer" - Me.txtKdAuftragsNrFrachtfuehrer.Size = New System.Drawing.Size(90, 22) + Me.txtKdAuftragsNrFrachtfuehrer.Size = New System.Drawing.Size(90, 20) Me.txtKdAuftragsNrFrachtfuehrer.TabIndex = 77 ' 'txtKdAuftragsNrEmpfaenger @@ -3502,7 +3502,7 @@ Partial Class frmSendungsdetailsNEU Me.txtKdAuftragsNrEmpfaenger.MaxLines_Warning = "" Me.txtKdAuftragsNrEmpfaenger.MaxLines_Warning_Label = Nothing Me.txtKdAuftragsNrEmpfaenger.Name = "txtKdAuftragsNrEmpfaenger" - Me.txtKdAuftragsNrEmpfaenger.Size = New System.Drawing.Size(90, 22) + Me.txtKdAuftragsNrEmpfaenger.Size = New System.Drawing.Size(90, 20) Me.txtKdAuftragsNrEmpfaenger.TabIndex = 48 ' 'txtKdAuftragsNrAvisierer @@ -3528,7 +3528,7 @@ Partial Class frmSendungsdetailsNEU Me.txtKdAuftragsNrAvisierer.MaxLines_Warning = "" Me.txtKdAuftragsNrAvisierer.MaxLines_Warning_Label = Nothing Me.txtKdAuftragsNrAvisierer.Name = "txtKdAuftragsNrAvisierer" - Me.txtKdAuftragsNrAvisierer.Size = New System.Drawing.Size(90, 22) + Me.txtKdAuftragsNrAvisierer.Size = New System.Drawing.Size(90, 20) Me.txtKdAuftragsNrAvisierer.TabIndex = 16 ' 'cntxt @@ -4060,7 +4060,7 @@ Partial Class frmSendungsdetailsNEU Me.txtAvisierer.Name = "txtAvisierer" Me.txtAvisierer.nurAktive = False Me.txtAvisierer.searchActive = True - Me.txtAvisierer.Size = New System.Drawing.Size(245, 22) + Me.txtAvisierer.Size = New System.Drawing.Size(245, 20) Me.txtAvisierer.TabIndex = 14 Me.txtAvisierer.TIMER_SEARCH = True Me.txtAvisierer.usrcntl = Nothing @@ -4090,7 +4090,7 @@ Partial Class frmSendungsdetailsNEU Me.txtAuftraggeber.Name = "txtAuftraggeber" Me.txtAuftraggeber.nurAktive = False Me.txtAuftraggeber.searchActive = True - Me.txtAuftraggeber.Size = New System.Drawing.Size(245, 22) + Me.txtAuftraggeber.Size = New System.Drawing.Size(245, 20) Me.txtAuftraggeber.TabIndex = 28 Me.txtAuftraggeber.TIMER_SEARCH = True Me.txtAuftraggeber.usrcntl = Nothing @@ -4144,7 +4144,7 @@ Partial Class frmSendungsdetailsNEU Me.txtFrachtfuehrerKdNr.MaxLines_Warning_Label = Nothing Me.txtFrachtfuehrerKdNr.Name = "txtFrachtfuehrerKdNr" Me.txtFrachtfuehrerKdNr.ReadOnly = True - Me.txtFrachtfuehrerKdNr.Size = New System.Drawing.Size(101, 15) + Me.txtFrachtfuehrerKdNr.Size = New System.Drawing.Size(101, 13) Me.txtFrachtfuehrerKdNr.TabIndex = 70 Me.txtFrachtfuehrerKdNr.TabStop = False ' @@ -4191,7 +4191,7 @@ Partial Class frmSendungsdetailsNEU Me.lblEmpfAufschubEust.Name = "lblEmpfAufschubEust" Me.lblEmpfAufschubEust.ReadOnly = True Me.lblEmpfAufschubEust.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.lblEmpfAufschubEust.Size = New System.Drawing.Size(69, 15) + Me.lblEmpfAufschubEust.Size = New System.Drawing.Size(69, 13) Me.lblEmpfAufschubEust.TabIndex = 55 Me.lblEmpfAufschubEust.TabStop = False Me.lblEmpfAufschubEust.TextAlign = System.Windows.Forms.HorizontalAlignment.Right @@ -4268,7 +4268,7 @@ Partial Class frmSendungsdetailsNEU Me.txtAbsenderKdNr.MaxLines_Warning_Label = Nothing Me.txtAbsenderKdNr.Name = "txtAbsenderKdNr" Me.txtAbsenderKdNr.ReadOnly = True - Me.txtAbsenderKdNr.Size = New System.Drawing.Size(101, 15) + Me.txtAbsenderKdNr.Size = New System.Drawing.Size(101, 13) Me.txtAbsenderKdNr.TabIndex = 57 Me.txtAbsenderKdNr.TabStop = False ' @@ -4306,7 +4306,7 @@ Partial Class frmSendungsdetailsNEU Me.MyTextBox1.MaxLines_Warning_Label = Nothing Me.MyTextBox1.Name = "MyTextBox1" Me.MyTextBox1.ReadOnly = True - Me.MyTextBox1.Size = New System.Drawing.Size(100, 15) + Me.MyTextBox1.Size = New System.Drawing.Size(100, 13) Me.MyTextBox1.TabIndex = 11 Me.MyTextBox1.TabStop = False Me.MyTextBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Right @@ -4356,7 +4356,7 @@ Partial Class frmSendungsdetailsNEU Me.txtEmpfaengerKdNr.MaxLines_Warning_Label = Nothing Me.txtEmpfaengerKdNr.Name = "txtEmpfaengerKdNr" Me.txtEmpfaengerKdNr.ReadOnly = True - Me.txtEmpfaengerKdNr.Size = New System.Drawing.Size(99, 15) + Me.txtEmpfaengerKdNr.Size = New System.Drawing.Size(99, 13) Me.txtEmpfaengerKdNr.TabIndex = 41 Me.txtEmpfaengerKdNr.TabStop = False ' @@ -4385,7 +4385,7 @@ Partial Class frmSendungsdetailsNEU Me.txtAbsender.Name = "txtAbsender" Me.txtAbsender.nurAktive = False Me.txtAbsender.searchActive = True - Me.txtAbsender.Size = New System.Drawing.Size(245, 22) + Me.txtAbsender.Size = New System.Drawing.Size(245, 20) Me.txtAbsender.TabIndex = 61 Me.txtAbsender.TIMER_SEARCH = True Me.txtAbsender.usrcntl = Nothing @@ -4414,7 +4414,7 @@ Partial Class frmSendungsdetailsNEU Me.txtEmpfaenger.Name = "txtEmpfaenger" Me.txtEmpfaenger.nurAktive = False Me.txtEmpfaenger.searchActive = True - Me.txtEmpfaenger.Size = New System.Drawing.Size(245, 22) + Me.txtEmpfaenger.Size = New System.Drawing.Size(245, 20) Me.txtEmpfaenger.TabIndex = 45 Me.txtEmpfaenger.TIMER_SEARCH = True Me.txtEmpfaenger.usrcntl = Nothing @@ -4466,7 +4466,7 @@ Partial Class frmSendungsdetailsNEU Me.lblAtrAufschubEust.Name = "lblAtrAufschubEust" Me.lblAtrAufschubEust.ReadOnly = True Me.lblAtrAufschubEust.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.lblAtrAufschubEust.Size = New System.Drawing.Size(69, 15) + Me.lblAtrAufschubEust.Size = New System.Drawing.Size(69, 13) Me.lblAtrAufschubEust.TabIndex = 38 Me.lblAtrAufschubEust.TabStop = False Me.lblAtrAufschubEust.TextAlign = System.Windows.Forms.HorizontalAlignment.Right @@ -4524,7 +4524,7 @@ Partial Class frmSendungsdetailsNEU Me.txtAuftraggeberKdNr.MaxLines_Warning_Label = Nothing Me.txtAuftraggeberKdNr.Name = "txtAuftraggeberKdNr" Me.txtAuftraggeberKdNr.ReadOnly = True - Me.txtAuftraggeberKdNr.Size = New System.Drawing.Size(100, 15) + Me.txtAuftraggeberKdNr.Size = New System.Drawing.Size(100, 13) Me.txtAuftraggeberKdNr.TabIndex = 23 Me.txtAuftraggeberKdNr.TabStop = False ' @@ -4643,7 +4643,7 @@ Partial Class frmSendungsdetailsNEU Me.txtAvisiererKdNr.MaxLines_Warning_Label = Nothing Me.txtAvisiererKdNr.Name = "txtAvisiererKdNr" Me.txtAvisiererKdNr.ReadOnly = True - Me.txtAvisiererKdNr.Size = New System.Drawing.Size(100, 15) + Me.txtAvisiererKdNr.Size = New System.Drawing.Size(100, 13) Me.txtAvisiererKdNr.TabIndex = 9 Me.txtAvisiererKdNr.TabStop = False ' @@ -4668,7 +4668,7 @@ Partial Class frmSendungsdetailsNEU Me.txtKdAuftragsNr.MaxLines_Warning = "" Me.txtKdAuftragsNr.MaxLines_Warning_Label = Nothing Me.txtKdAuftragsNr.Name = "txtKdAuftragsNr" - Me.txtKdAuftragsNr.Size = New System.Drawing.Size(90, 22) + Me.txtKdAuftragsNr.Size = New System.Drawing.Size(90, 20) Me.txtKdAuftragsNr.TabIndex = 31 ' 'LinkLabel4 @@ -5026,7 +5026,7 @@ Partial Class frmSendungsdetailsNEU Me.cbxFremdspedition.ForeColor = System.Drawing.Color.White Me.cbxFremdspedition.Location = New System.Drawing.Point(593, 7) Me.cbxFremdspedition.Name = "cbxFremdspedition" - Me.cbxFremdspedition.Size = New System.Drawing.Size(107, 17) + Me.cbxFremdspedition.Size = New System.Drawing.Size(97, 17) Me.cbxFremdspedition.TabIndex = 7 Me.cbxFremdspedition.Text = "Fremdspedition" Me.cbxFremdspedition.UseVisualStyleBackColor = False @@ -5115,7 +5115,7 @@ Partial Class frmSendungsdetailsNEU Me.txtFremdEmpfKdNR.MaxLines_Warning_Label = Nothing Me.txtFremdEmpfKdNR.Name = "txtFremdEmpfKdNR" Me.txtFremdEmpfKdNR.ReadOnly = True - Me.txtFremdEmpfKdNR.Size = New System.Drawing.Size(100, 15) + Me.txtFremdEmpfKdNR.Size = New System.Drawing.Size(100, 13) Me.txtFremdEmpfKdNR.TabIndex = 2 Me.txtFremdEmpfKdNR.TabStop = False Me.txtFremdEmpfKdNR.TextAlign = System.Windows.Forms.HorizontalAlignment.Right @@ -5598,7 +5598,7 @@ Partial Class frmSendungsdetailsNEU Me.lblZuweisungVP.AutoSize = True Me.lblZuweisungVP.Location = New System.Drawing.Point(2, 0) Me.lblZuweisungVP.Name = "lblZuweisungVP" - Me.lblZuweisungVP.Size = New System.Drawing.Size(120, 13) + Me.lblZuweisungVP.Size = New System.Drawing.Size(110, 13) Me.lblZuweisungVP.TabIndex = 0 Me.lblZuweisungVP.Text = "Zuweisung Vorpapier:" ' @@ -5629,7 +5629,7 @@ Partial Class frmSendungsdetailsNEU Me.lblGrenzeSnd.AutoSize = True Me.lblGrenzeSnd.Location = New System.Drawing.Point(320, 0) Me.lblGrenzeSnd.Name = "lblGrenzeSnd" - Me.lblGrenzeSnd.Size = New System.Drawing.Size(46, 13) + Me.lblGrenzeSnd.Size = New System.Drawing.Size(44, 13) Me.lblGrenzeSnd.TabIndex = 3 Me.lblGrenzeSnd.Text = "Grenze:" ' @@ -5707,7 +5707,7 @@ Partial Class frmSendungsdetailsNEU Me.lblAktMA.AutoSize = True Me.lblAktMA.Location = New System.Drawing.Point(3, 0) Me.lblAktMA.Name = "lblAktMA" - Me.lblAktMA.Size = New System.Drawing.Size(76, 13) + Me.lblAktMA.Size = New System.Drawing.Size(70, 13) Me.lblAktMA.TabIndex = 0 Me.lblAktMA.Text = "Aktueller MA:" ' @@ -5780,7 +5780,7 @@ Partial Class frmSendungsdetailsNEU Me.lblGesamt.AutoSize = True Me.lblGesamt.Location = New System.Drawing.Point(3, 26) Me.lblGesamt.Name = "lblGesamt" - Me.lblGesamt.Size = New System.Drawing.Size(48, 13) + Me.lblGesamt.Size = New System.Drawing.Size(46, 13) Me.lblGesamt.TabIndex = 0 Me.lblGesamt.Text = "Gesamt:" ' @@ -5799,7 +5799,7 @@ Partial Class frmSendungsdetailsNEU Me.Label16.AutoSize = True Me.Label16.Location = New System.Drawing.Point(4, 8) Me.Label16.Name = "Label16" - Me.Label16.Size = New System.Drawing.Size(76, 13) + Me.Label16.Size = New System.Drawing.Size(70, 13) Me.Label16.TabIndex = 111 Me.Label16.Text = "Sendungs-Id:" ' @@ -6460,7 +6460,7 @@ Partial Class frmSendungsdetailsNEU Me.BackColor = System.Drawing.Color.White Me.ClientSize = New System.Drawing.Size(1235, 883) Me.Controls.Add(Me.pnl) - Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.KeyPreview = True Me.MainMenuStrip = Me.MenuStrip diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index a3f36f4..ffa3676 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -1786,6 +1786,7 @@ Public Class frmSendungsdetailsNEU initSND_CHAT(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID) checkinitOLDAbfertigungsart(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Abfertigungsart_ID) + lblSendungsId.Text = SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID initSendungs_Status() initZuteilung() @@ -2093,8 +2094,10 @@ Public Class frmSendungsdetailsNEU Dim gesGewicht As Double = 0 For Each s In SENDUNG_LIST - If s.tblSnd_Colli IsNot Nothing AndAlso IsNumeric(s.tblSnd_Colli.Replace("Pk", "").Replace(".", "").Trim) Then gesColli += s.tblSnd_Colli - If s.tblSnd_Gewicht IsNot Nothing AndAlso IsNumeric(s.tblSnd_Gewicht.Replace("kg", "").Trim) Then gesGewicht += s.tblSnd_Gewicht + If s.tblSnd_Abfertigungsart_ID <> 45 Then + If s.tblSnd_Colli IsNot Nothing AndAlso IsNumeric(s.tblSnd_Colli.Replace("Pk", "").Replace(".", "").Trim) Then gesColli += s.tblSnd_Colli + If s.tblSnd_Gewicht IsNot Nothing AndAlso IsNumeric(s.tblSnd_Gewicht.Replace("kg", "").Trim) Then gesGewicht += s.tblSnd_Gewicht + End If Next 'lblGesColli.Text = If(gesColli = 0, "-", gesColli.ToString("N0")) & " Pk" @@ -8151,6 +8154,7 @@ Public Class frmSendungsdetailsNEU Private Sub btnStatusAbklaerungTR_Click(sender As Object, e As EventArgs) Handles btnStatusAbklaerungTR.Click Me.Cursor = Cursors.WaitCursor + SAVE_ME() If AVISOFUNC.setSendungAbklaerungTR(SendungID, AvisoId) Then initDataBinding() End If @@ -8159,6 +8163,7 @@ Public Class frmSendungsdetailsNEU Private Sub btnStatusVorbereitetQS_Click(sender As Object, e As EventArgs) Handles btnStatusVorbereitetQS.Click Me.Cursor = Cursors.WaitCursor + SAVE_ME() If AVISOFUNC.setSendungVorbereitetQS(SendungID, AvisoId) Then initDataBinding() End If @@ -8167,6 +8172,7 @@ Public Class frmSendungsdetailsNEU Private Sub btnStatusVorgeschrieben_Click(sender As Object, e As EventArgs) Handles btnStatusVorgeschrieben.Click Me.Cursor = Cursors.WaitCursor + SAVE_ME() If AVISOFUNC.setSendungVorgeschrieben(SendungID, AvisoId) Then initDataBinding() End If @@ -8175,6 +8181,7 @@ Public Class frmSendungsdetailsNEU Private Sub btnStatusAbfertigungTR_Click(sender As Object, e As EventArgs) Handles btnStatusAbfertigungTR.Click Me.Cursor = Cursors.WaitCursor + SAVE_ME() If AVISOFUNC.setSendungAbfertigungTR(SendungID, AvisoId) Then initDataBinding() End If @@ -8183,6 +8190,7 @@ Public Class frmSendungsdetailsNEU Private Sub btnSpeditionsbuchEintragen_Click(sender As Object, e As EventArgs) Handles btnSpeditionsbuchEintragen.Click Me.Cursor = Cursors.WaitCursor + SAVE_ME() If Not cbxFremdspedition.Checked Then If AVISOFUNC.setSendungSpeditionsbuchEintrag(SendungID, AvisoId) Then initDataBinding() @@ -8193,6 +8201,7 @@ Public Class frmSendungsdetailsNEU Private Sub btnSendungFakturiert_Click(sender As Object, e As EventArgs) Handles btnSendungFakturiert.Click Me.Cursor = Cursors.WaitCursor + SAVE_ME() If AVISOFUNC.setSendungFakturiert(SendungID, AvisoId) Then initDataBinding() End If