From 7622804091300938f6855595b10c8ce26f567ed7 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Fri, 14 Oct 2022 08:11:50 +0200 Subject: [PATCH] =?UTF-8?q?Design=20=C3=84nderugnen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Aviso/frmEintragAviso.vb | 3 +- Aviso/frmHauptfenster.vb | 1 + Aviso/frmSendungsdetailsNEU.Designer.vb | 111 ++++++++++++++++-------- Aviso/frmSendungsdetailsNEU.vb | 2 + 4 files changed, 80 insertions(+), 37 deletions(-) diff --git a/Aviso/frmEintragAviso.vb b/Aviso/frmEintragAviso.vb index 4a66f42..a4b70ab 100644 --- a/Aviso/frmEintragAviso.vb +++ b/Aviso/frmEintragAviso.vb @@ -168,6 +168,7 @@ Public Class frmEintragAviso cboImEx.Text = "IMPORT" Case "VERIMEX" cboFirma.Enabled = True + End Select If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then @@ -1704,7 +1705,7 @@ Public Class frmEintragAviso Label1.Visible = (cboGrenzstelle._value = "WAI" Or cboGrenzstelle._value = "DTB" Or FIRMA_TMP = "IMEX" Or FIRMA_TMP = "UNISPED") Select Case FIRMA_TMP - Case "VERAG", "FRONTOFFICE", "UNISPED", "IMEX", "AMBAR" + Case "VERAG", "FRONTOFFICE", "UNISPED", "IMEX", "AMBAR", "VERIMEX" If cboGrenzstelle._value = "???" Then 'txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"}) diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index 2d6ad57..c47af49 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -1422,6 +1422,7 @@ Public Class frmHauptfenster Case "3" ' Ankunft r.DefaultCellStyle.BackColor = Color.IndianRed + r.Cells("DauerText").Style.ForeColor = Color.White Case Else 'Alle anderen Status: If r.Cells("VoraussichtlichesEintreffen").Value IsNot DBNull.Value AndAlso IsDate(r.Cells("VoraussichtlichesEintreffen").Value) Then diff --git a/Aviso/frmSendungsdetailsNEU.Designer.vb b/Aviso/frmSendungsdetailsNEU.Designer.vb index bcd0b8a..25ad58e 100644 --- a/Aviso/frmSendungsdetailsNEU.Designer.vb +++ b/Aviso/frmSendungsdetailsNEU.Designer.vb @@ -114,9 +114,11 @@ Partial Class frmSendungsdetailsNEU Me.pnlDetails = New System.Windows.Forms.Panel() Me.tbcntr = New System.Windows.Forms.TabControl() Me.TabPage4 = New System.Windows.Forms.TabPage() + Me.Button18 = New System.Windows.Forms.Button() + Me.txtFrachtkostenGesamt = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label10 = New System.Windows.Forms.Label() Me.Label6 = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() - Me.Button18 = New System.Windows.Forms.Button() Me.txtFrachtkostenNichtEU = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtFrachtkostenEU = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.cbx = New System.Windows.Forms.CheckBox() @@ -1491,18 +1493,20 @@ Partial Class frmSendungsdetailsNEU Me.tbcntr.Controls.Add(Me.TabPage4) Me.tbcntr.Controls.Add(Me.tbVorkosten) Me.tbcntr.Controls.Add(Me.tbBAR) - Me.tbcntr.Location = New System.Drawing.Point(837, 69) + Me.tbcntr.Location = New System.Drawing.Point(773, 69) Me.tbcntr.Name = "tbcntr" Me.tbcntr.SelectedIndex = 0 - Me.tbcntr.Size = New System.Drawing.Size(377, 325) + Me.tbcntr.Size = New System.Drawing.Size(441, 325) Me.tbcntr.TabIndex = 2 Me.tbcntr.TabStop = False ' 'TabPage4 ' + Me.TabPage4.Controls.Add(Me.Button18) + Me.TabPage4.Controls.Add(Me.txtFrachtkostenGesamt) + Me.TabPage4.Controls.Add(Me.Label10) Me.TabPage4.Controls.Add(Me.Label6) Me.TabPage4.Controls.Add(Me.Label1) - Me.TabPage4.Controls.Add(Me.Button18) Me.TabPage4.Controls.Add(Me.txtFrachtkostenNichtEU) Me.TabPage4.Controls.Add(Me.txtFrachtkostenEU) Me.TabPage4.Controls.Add(Me.cbx) @@ -1534,16 +1538,60 @@ Partial Class frmSendungsdetailsNEU Me.TabPage4.Location = New System.Drawing.Point(4, 22) Me.TabPage4.Name = "TabPage4" Me.TabPage4.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage4.Size = New System.Drawing.Size(369, 299) + Me.TabPage4.Size = New System.Drawing.Size(433, 299) Me.TabPage4.TabIndex = 0 Me.TabPage4.Text = "Aktendeckel" Me.TabPage4.UseVisualStyleBackColor = True ' + 'Button18 + ' + Me.Button18.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button18.Location = New System.Drawing.Point(269, 76) + Me.Button18.Name = "Button18" + Me.Button18.Size = New System.Drawing.Size(156, 21) + Me.Button18.TabIndex = 60 + Me.Button18.Text = "berechnen" + Me.Button18.UseVisualStyleBackColor = True + ' + 'txtFrachtkostenGesamt + ' + Me.txtFrachtkostenGesamt._DateTimeOnly = False + Me.txtFrachtkostenGesamt._numbersOnly = False + Me.txtFrachtkostenGesamt._numbersOnlyKommastellen = "" + Me.txtFrachtkostenGesamt._numbersOnlyTrennzeichen = True + Me.txtFrachtkostenGesamt._Prozent = False + Me.txtFrachtkostenGesamt._ShortDateNew = False + Me.txtFrachtkostenGesamt._ShortDateOnly = False + Me.txtFrachtkostenGesamt._TimeOnly = False + Me.txtFrachtkostenGesamt._TimeOnly_Seconds = False + Me.txtFrachtkostenGesamt._value = "" + Me.txtFrachtkostenGesamt._Waehrung = True + Me.txtFrachtkostenGesamt._WaehrungZeichen = True + Me.txtFrachtkostenGesamt.ForeColor = System.Drawing.Color.Black + Me.txtFrachtkostenGesamt.Location = New System.Drawing.Point(375, 57) + Me.txtFrachtkostenGesamt.MaxLineLength = -1 + Me.txtFrachtkostenGesamt.MaxLines_Warning = "" + Me.txtFrachtkostenGesamt.MaxLines_Warning_Label = Nothing + Me.txtFrachtkostenGesamt.Name = "txtFrachtkostenGesamt" + Me.txtFrachtkostenGesamt.Size = New System.Drawing.Size(50, 20) + Me.txtFrachtkostenGesamt.TabIndex = 61 + Me.txtFrachtkostenGesamt.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'Label10 + ' + Me.Label10.AutoSize = True + Me.Label10.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) + Me.Label10.Location = New System.Drawing.Point(383, 43) + Me.Label10.Name = "Label10" + Me.Label10.Size = New System.Drawing.Size(43, 13) + Me.Label10.TabIndex = 62 + Me.Label10.Text = "Gesamt" + ' 'Label6 ' Me.Label6.AutoSize = True Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) - Me.Label6.Location = New System.Drawing.Point(293, 43) + Me.Label6.Location = New System.Drawing.Point(302, 43) Me.Label6.Name = "Label6" Me.Label6.Size = New System.Drawing.Size(21, 13) Me.Label6.TabIndex = 16 @@ -1552,22 +1600,12 @@ Partial Class frmSendungsdetailsNEU 'Label1 ' Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(261, 43) + Me.Label1.Location = New System.Drawing.Point(266, 43) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(40, 13) Me.Label1.TabIndex = 13 Me.Label1.Text = "Fracht:" ' - 'Button18 - ' - Me.Button18.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button18.Location = New System.Drawing.Point(264, 76) - Me.Button18.Name = "Button18" - Me.Button18.Size = New System.Drawing.Size(99, 21) - Me.Button18.TabIndex = 60 - Me.Button18.Text = "berechnen" - Me.Button18.UseVisualStyleBackColor = True - ' 'txtFrachtkostenNichtEU ' Me.txtFrachtkostenNichtEU._DateTimeOnly = False @@ -1583,12 +1621,12 @@ Partial Class frmSendungsdetailsNEU Me.txtFrachtkostenNichtEU._Waehrung = True Me.txtFrachtkostenNichtEU._WaehrungZeichen = True Me.txtFrachtkostenNichtEU.ForeColor = System.Drawing.Color.Black - Me.txtFrachtkostenNichtEU.Location = New System.Drawing.Point(313, 57) + Me.txtFrachtkostenNichtEU.Location = New System.Drawing.Point(322, 57) Me.txtFrachtkostenNichtEU.MaxLineLength = -1 Me.txtFrachtkostenNichtEU.MaxLines_Warning = "" Me.txtFrachtkostenNichtEU.MaxLines_Warning_Label = Nothing Me.txtFrachtkostenNichtEU.Name = "txtFrachtkostenNichtEU" - Me.txtFrachtkostenNichtEU.Size = New System.Drawing.Size(50, 20) + Me.txtFrachtkostenNichtEU.Size = New System.Drawing.Size(54, 20) Me.txtFrachtkostenNichtEU.TabIndex = 14 Me.txtFrachtkostenNichtEU.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' @@ -1607,19 +1645,19 @@ Partial Class frmSendungsdetailsNEU Me.txtFrachtkostenEU._Waehrung = True Me.txtFrachtkostenEU._WaehrungZeichen = True Me.txtFrachtkostenEU.ForeColor = System.Drawing.Color.Black - Me.txtFrachtkostenEU.Location = New System.Drawing.Point(264, 57) + Me.txtFrachtkostenEU.Location = New System.Drawing.Point(269, 57) Me.txtFrachtkostenEU.MaxLineLength = -1 Me.txtFrachtkostenEU.MaxLines_Warning = "" Me.txtFrachtkostenEU.MaxLines_Warning_Label = Nothing Me.txtFrachtkostenEU.Name = "txtFrachtkostenEU" - Me.txtFrachtkostenEU.Size = New System.Drawing.Size(50, 20) + Me.txtFrachtkostenEU.Size = New System.Drawing.Size(54, 20) Me.txtFrachtkostenEU.TabIndex = 12 Me.txtFrachtkostenEU.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' 'cbx ' Me.cbx.AutoSize = True - Me.cbx.Location = New System.Drawing.Point(310, 168) + Me.cbx.Location = New System.Drawing.Point(373, 168) Me.cbx.Name = "cbx" Me.cbx.Size = New System.Drawing.Size(55, 17) Me.cbx.TabIndex = 23 @@ -1691,7 +1729,7 @@ Partial Class frmSendungsdetailsNEU Me.Button21.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.Button21.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button21.Location = New System.Drawing.Point(233, 269) + Me.Button21.Location = New System.Drawing.Point(296, 269) Me.Button21.Name = "Button21" Me.Button21.Padding = New System.Windows.Forms.Padding(0, 0, 10, 0) Me.Button21.Size = New System.Drawing.Size(131, 30) @@ -1713,7 +1751,7 @@ Partial Class frmSendungsdetailsNEU ' Me.rtbAnmerkungDispoliste.Location = New System.Drawing.Point(6, 268) Me.rtbAnmerkungDispoliste.Name = "rtbAnmerkungDispoliste" - Me.rtbAnmerkungDispoliste.Size = New System.Drawing.Size(224, 31) + Me.rtbAnmerkungDispoliste.Size = New System.Drawing.Size(284, 31) Me.rtbAnmerkungDispoliste.TabIndex = 28 Me.rtbAnmerkungDispoliste.Text = "" ' @@ -1724,7 +1762,7 @@ Partial Class frmSendungsdetailsNEU Me.btnImportaviso.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.btnImportaviso.Image = Global.AVISO.My.Resources.Resources.auftrag3 Me.btnImportaviso.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnImportaviso.Location = New System.Drawing.Point(233, 211) + Me.btnImportaviso.Location = New System.Drawing.Point(296, 211) Me.btnImportaviso.Name = "btnImportaviso" Me.btnImportaviso.Padding = New System.Windows.Forms.Padding(0, 0, 10, 0) Me.btnImportaviso.Size = New System.Drawing.Size(131, 30) @@ -1741,7 +1779,7 @@ Partial Class frmSendungsdetailsNEU Me.btnVorauszahlung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.btnVorauszahlung.Image = Global.AVISO.My.Resources.Resources.vorauszahlung3 Me.btnVorauszahlung.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnVorauszahlung.Location = New System.Drawing.Point(233, 240) + Me.btnVorauszahlung.Location = New System.Drawing.Point(296, 240) Me.btnVorauszahlung.Name = "btnVorauszahlung" Me.btnVorauszahlung.Padding = New System.Windows.Forms.Padding(0, 0, 10, 0) Me.btnVorauszahlung.Size = New System.Drawing.Size(131, 30) @@ -1796,7 +1834,7 @@ Partial Class frmSendungsdetailsNEU 'Label35 ' Me.Label35.AutoSize = True - Me.Label35.Location = New System.Drawing.Point(232, 112) + Me.Label35.Location = New System.Drawing.Point(295, 112) Me.Label35.Name = "Label35" Me.Label35.Size = New System.Drawing.Size(131, 13) Me.Label35.TabIndex = 18 @@ -1815,7 +1853,7 @@ Partial Class frmSendungsdetailsNEU ' Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button3.Image = CType(resources.GetObject("Button3.Image"), System.Drawing.Image) - Me.Button3.Location = New System.Drawing.Point(233, 127) + Me.Button3.Location = New System.Drawing.Point(296, 127) Me.Button3.Margin = New System.Windows.Forms.Padding(0, 3, 0, 3) Me.Button3.Name = "Button3" Me.Button3.Size = New System.Drawing.Size(78, 60) @@ -1828,7 +1866,7 @@ Partial Class frmSendungsdetailsNEU Me.Button8.BackgroundImage = CType(resources.GetObject("Button8.BackgroundImage"), System.Drawing.Image) Me.Button8.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button8.Location = New System.Drawing.Point(310, 127) + Me.Button8.Location = New System.Drawing.Point(373, 127) Me.Button8.Name = "Button8" Me.Button8.Size = New System.Drawing.Size(54, 60) Me.Button8.TabIndex = 22 @@ -1903,7 +1941,7 @@ Partial Class frmSendungsdetailsNEU Me.cboPrinter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.cboPrinter.DropDownWidth = 300 Me.cboPrinter.FormattingEnabled = True - Me.cboPrinter.Location = New System.Drawing.Point(233, 187) + Me.cboPrinter.Location = New System.Drawing.Point(296, 187) Me.cboPrinter.Name = "cboPrinter" Me.cboPrinter.Size = New System.Drawing.Size(131, 21) Me.cboPrinter.TabIndex = 24 @@ -1912,7 +1950,7 @@ Partial Class frmSendungsdetailsNEU ' Me.rtbAnmerkung.Location = New System.Drawing.Point(6, 127) Me.rtbAnmerkung.Name = "rtbAnmerkung" - Me.rtbAnmerkung.Size = New System.Drawing.Size(224, 124) + Me.rtbAnmerkung.Size = New System.Drawing.Size(284, 124) Me.rtbAnmerkung.TabIndex = 19 Me.rtbAnmerkung.Text = "" ' @@ -1922,7 +1960,7 @@ Partial Class frmSendungsdetailsNEU Me.Panel22.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer)) Me.Panel22.Controls.Add(Me.lblZuKass) Me.Panel22.Controls.Add(Me.txtBARzuKassieren) - Me.Panel22.Location = New System.Drawing.Point(260, 0) + Me.Panel22.Location = New System.Drawing.Point(324, 0) Me.Panel22.Name = "Panel22" Me.Panel22.Size = New System.Drawing.Size(108, 41) Me.Panel22.TabIndex = 2 @@ -1965,7 +2003,7 @@ Partial Class frmSendungsdetailsNEU ' Me.Label7.AutoSize = True Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) - Me.Label7.Location = New System.Drawing.Point(321, 43) + Me.Label7.Location = New System.Drawing.Point(329, 43) Me.Label7.Name = "Label7" Me.Label7.Size = New System.Drawing.Size(47, 13) Me.Label7.TabIndex = 15 @@ -2000,7 +2038,7 @@ Partial Class frmSendungsdetailsNEU Me.tbVorkosten.Controls.Add(Me.dgvVorkosten) Me.tbVorkosten.Location = New System.Drawing.Point(4, 22) Me.tbVorkosten.Name = "tbVorkosten" - Me.tbVorkosten.Size = New System.Drawing.Size(369, 299) + Me.tbVorkosten.Size = New System.Drawing.Size(433, 299) Me.tbVorkosten.TabIndex = 2 Me.tbVorkosten.Text = "Vorkosten" Me.tbVorkosten.UseVisualStyleBackColor = True @@ -2166,7 +2204,7 @@ Partial Class frmSendungsdetailsNEU Me.tbBAR.Location = New System.Drawing.Point(4, 22) Me.tbBAR.Name = "tbBAR" Me.tbBAR.Padding = New System.Windows.Forms.Padding(3) - Me.tbBAR.Size = New System.Drawing.Size(369, 299) + Me.tbBAR.Size = New System.Drawing.Size(433, 299) Me.tbBAR.TabIndex = 1 Me.tbBAR.Text = "Abrechnung/BAR-Belege" Me.tbBAR.UseVisualStyleBackColor = True @@ -4806,7 +4844,6 @@ Partial Class frmSendungsdetailsNEU ' Me.BindingNavigatorPositionItem.AccessibleName = "Position" Me.BindingNavigatorPositionItem.AutoSize = False - Me.BindingNavigatorPositionItem.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.BindingNavigatorPositionItem.Name = "BindingNavigatorPositionItem" Me.BindingNavigatorPositionItem.Size = New System.Drawing.Size(50, 23) Me.BindingNavigatorPositionItem.Text = "0" @@ -5534,4 +5571,6 @@ Partial Class frmSendungsdetailsNEU Friend WithEvents Label6 As Label Friend WithEvents Label7 As Label Friend WithEvents Button18 As Button + Friend WithEvents txtFrachtkostenGesamt As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label10 As Label End Class diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index ce273cd..e7a96a8 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -1137,6 +1137,7 @@ Public Class frmSendungsdetailsNEU txtFrachtkostenEU.Text = If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Frachtkosten, "") txtFrachtkostenNichtEU.Text = If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_FrachtkostenNichtEU, "") + txtFrachtkostenGesamt.Text = If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_FrachtkostenGesamt, "") txtWarenwert.Text = If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert, "") txtWarenwertWaehrung.SET_VALUE(If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_WarenwertWaehrung, "")) @@ -1727,6 +1728,7 @@ Public Class frmSendungsdetailsNEU SENDUNG_LIST(CURRENT_INDEX).tblSnd_Frachtkosten = SQL.isNullNothingDbl(txtFrachtkostenEU.Text) SENDUNG_LIST(CURRENT_INDEX).tblSnd_FrachtkostenNichtEU = SQL.isNullNothingDbl(txtFrachtkostenNichtEU.Text) + SENDUNG_LIST(CURRENT_INDEX).tblSnd_FrachtkostenGesamt = SQL.isNullNothingDbl(txtFrachtkostenGesamt.Text) SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert = SQL.isNullNothingDbl(txtWarenwert.Text)