diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index b264e34..98715aa 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -1758,8 +1758,7 @@ - - + \\192.168.0.90\f\Zertifikate\signtool.exe sign /f \\192.168.0.90\f\Zertifikate\AL20231110.pfx /p zYGNNJRG+tzlw90Rz6NqOXnoeBycFCy07YcUsY5iD0M= "AVISO.exe" diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 849b91a..070923e 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/frmHauptfenster.Designer.vb b/Aviso/frmHauptfenster.Designer.vb index b5f5809..d6258af 100644 --- a/Aviso/frmHauptfenster.Designer.vb +++ b/Aviso/frmHauptfenster.Designer.vb @@ -24,15 +24,15 @@ Partial Class frmHauptfenster Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmHauptfenster)) - Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.mnuInfo = New System.Windows.Forms.ToolStripMenuItem() Me.conÜbernehmen = New System.Windows.Forms.ToolStripMenuItem() Me.conMenuAviso = New System.Windows.Forms.ContextMenuStrip(Me.components) @@ -129,7 +129,7 @@ Partial Class frmHauptfenster Me.DAKOSYToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.StammreferenzenVerwaltenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator23 = New System.Windows.Forms.ToolStripSeparator() - Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() + Me.toolOriginalATR = New System.Windows.Forms.ToolStripMenuItem() Me.SDLAbholaufträgeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem13 = New System.Windows.Forms.ToolStripMenuItem() Me.VorauskassenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -865,7 +865,7 @@ Partial Class frmHauptfenster ' 'FunktionenToolStripMenuItem ' - Me.FunktionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GenerelleGestellungenDurchsuchenToolStripMenuItem, Me.KundenVonFremdenSpeditionenToolStripMenuItem, Me.KundenverwaltungToolStripMenuItem, Me.MDMParkplatzkartenToolStripMenuItem, Me.SMSSendenToolStripMenuItem, Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem, Me.MRNBarcodedruckToolStripMenuItem, Me.ToolStripSeparator12, Me.tool_BRGXLS, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.BürgschaftenExcelToolStripMenuItem, Me.ToolStripMenuItem6, Me.GesamtsicherheitenToolStripMenuItem, Me.ToolStripMenuItem10, Me.TICKETWaidhausToolStripMenuItem, Me.ToolStripSeparator10, Me.DAKOSYToolStripMenuItem, Me.ToolStripSeparator23, Me.ToolStripMenuItem3, Me.SDLAbholaufträgeToolStripMenuItem, Me.ToolStripMenuItem13, Me.VorauskassenToolStripMenuItem, Me.ToolStripSeparator11, Me.EssensbestellungenToolStripMenuItem, Me.AdministrationEssensbestellungenToolStripMenuItem, Me.ToolStripSeparator24, Me.WarenorteToolStripMenuItem, Me.DatevBuchungsexportToolStripMenuItem, Me.APIToolStripMenuItem}) + Me.FunktionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GenerelleGestellungenDurchsuchenToolStripMenuItem, Me.KundenVonFremdenSpeditionenToolStripMenuItem, Me.KundenverwaltungToolStripMenuItem, Me.MDMParkplatzkartenToolStripMenuItem, Me.SMSSendenToolStripMenuItem, Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem, Me.MRNBarcodedruckToolStripMenuItem, Me.ToolStripSeparator12, Me.tool_BRGXLS, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.BürgschaftenExcelToolStripMenuItem, Me.ToolStripMenuItem6, Me.GesamtsicherheitenToolStripMenuItem, Me.ToolStripMenuItem10, Me.TICKETWaidhausToolStripMenuItem, Me.ToolStripSeparator10, Me.DAKOSYToolStripMenuItem, Me.ToolStripSeparator23, Me.toolOriginalATR, Me.SDLAbholaufträgeToolStripMenuItem, Me.ToolStripMenuItem13, Me.VorauskassenToolStripMenuItem, Me.ToolStripSeparator11, Me.EssensbestellungenToolStripMenuItem, Me.AdministrationEssensbestellungenToolStripMenuItem, Me.ToolStripSeparator24, Me.WarenorteToolStripMenuItem, Me.DatevBuchungsexportToolStripMenuItem, Me.APIToolStripMenuItem}) Me.FunktionenToolStripMenuItem.Name = "FunktionenToolStripMenuItem" Me.FunktionenToolStripMenuItem.Size = New System.Drawing.Size(79, 21) Me.FunktionenToolStripMenuItem.Text = "Funktionen" @@ -977,31 +977,31 @@ Partial Class frmHauptfenster 'ATVeragAGToolStripMenuItem ' Me.ATVeragAGToolStripMenuItem.Name = "ATVeragAGToolStripMenuItem" - Me.ATVeragAGToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ATVeragAGToolStripMenuItem.Size = New System.Drawing.Size(178, 22) Me.ATVeragAGToolStripMenuItem.Text = "AT | Verag AG" ' 'ATImexCSToolStripMenuItem ' Me.ATImexCSToolStripMenuItem.Name = "ATImexCSToolStripMenuItem" - Me.ATImexCSToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ATImexCSToolStripMenuItem.Size = New System.Drawing.Size(178, 22) Me.ATImexCSToolStripMenuItem.Text = "AT | IMEX CS GmbH" ' 'ATVeragCSToolStripMenuItem ' Me.ATVeragCSToolStripMenuItem.Name = "ATVeragCSToolStripMenuItem" - Me.ATVeragCSToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ATVeragCSToolStripMenuItem.Size = New System.Drawing.Size(178, 22) Me.ATVeragCSToolStripMenuItem.Text = "AT | Verag CS" ' 'DEVeragGmbHToolStripMenuItem ' Me.DEVeragGmbHToolStripMenuItem.Name = "DEVeragGmbHToolStripMenuItem" - Me.DEVeragGmbHToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.DEVeragGmbHToolStripMenuItem.Size = New System.Drawing.Size(178, 22) Me.DEVeragGmbHToolStripMenuItem.Text = "DE | Verag GmbH" ' 'ATUnispedGmbHToolStripMenuItem ' Me.ATUnispedGmbHToolStripMenuItem.Name = "ATUnispedGmbHToolStripMenuItem" - Me.ATUnispedGmbHToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ATUnispedGmbHToolStripMenuItem.Size = New System.Drawing.Size(178, 22) Me.ATUnispedGmbHToolStripMenuItem.Text = "AT | Unisped GmbH" ' 'ToolStripMenuItem10 @@ -1039,12 +1039,12 @@ Partial Class frmHauptfenster Me.ToolStripSeparator23.Name = "ToolStripSeparator23" Me.ToolStripSeparator23.Size = New System.Drawing.Size(388, 6) ' - 'ToolStripMenuItem3 + 'toolOriginalATR ' - Me.ToolStripMenuItem3.Image = Global.AVISO.My.Resources.Resources.atr - Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3" - Me.ToolStripMenuItem3.Size = New System.Drawing.Size(391, 30) - Me.ToolStripMenuItem3.Text = "Original-ATR" + Me.toolOriginalATR.Image = Global.AVISO.My.Resources.Resources.atr + Me.toolOriginalATR.Name = "toolOriginalATR" + Me.toolOriginalATR.Size = New System.Drawing.Size(391, 30) + Me.toolOriginalATR.Text = "Original-ATR" ' 'SDLAbholaufträgeToolStripMenuItem ' @@ -2481,38 +2481,38 @@ Partial Class frmHauptfenster Me.gridMyAviso.AllowUserToDeleteRows = False Me.gridMyAviso.AllowUserToOrderColumns = True Me.gridMyAviso.AllowUserToResizeRows = False - DataGridViewCellStyle19.BackColor = System.Drawing.Color.Azure - Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle19 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure + Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.gridMyAviso.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - DataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridMyAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle20 + DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridMyAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2 Me.gridMyAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle21 + DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle3 Me.gridMyAviso.Dock = System.Windows.Forms.DockStyle.Fill Me.gridMyAviso.Location = New System.Drawing.Point(0, 21) Me.gridMyAviso.Name = "gridMyAviso" Me.gridMyAviso.ReadOnly = True - DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle22 + DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle4 Me.gridMyAviso.RowHeadersVisible = False Me.gridMyAviso.RowHeadersWidth = 62 Me.gridMyAviso.Size = New System.Drawing.Size(488, 279) @@ -2925,47 +2925,47 @@ Partial Class frmHauptfenster Me.gridAviso.AllowUserToAddRows = False Me.gridAviso.AllowUserToDeleteRows = False Me.gridAviso.AllowUserToResizeRows = False - DataGridViewCellStyle23.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle23 + DataGridViewCellStyle5.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5 Me.gridAviso.BackgroundColor = System.Drawing.Color.DarkGray Me.gridAviso.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable - DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle24.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle24.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle24 + DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle6.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle6.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle6 Me.gridAviso.ColumnHeadersHeight = 25 Me.gridAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - DataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle25 + DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle7 Me.gridAviso.Dock = System.Windows.Forms.DockStyle.Fill Me.gridAviso.Location = New System.Drawing.Point(0, 248) Me.gridAviso.MultiSelect = False Me.gridAviso.Name = "gridAviso" Me.gridAviso.ReadOnly = True - DataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle26.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle26 + DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle8 Me.gridAviso.RowHeadersVisible = False Me.gridAviso.RowHeadersWidth = 62 Me.gridAviso.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle27 + DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle9 Me.gridAviso.RowTemplate.ReadOnly = True Me.gridAviso.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] Me.gridAviso.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect @@ -4159,7 +4159,7 @@ Partial Class frmHauptfenster Friend WithEvents ZertifikateToolStripMenuItem As ToolStripMenuItem Friend WithEvents HomepageToolStripMenuItem As ToolStripMenuItem Friend WithEvents ToolStripSeparator23 As ToolStripSeparator - Friend WithEvents ToolStripMenuItem3 As ToolStripMenuItem + Friend WithEvents toolOriginalATR As ToolStripMenuItem Friend WithEvents ToolStripSeparator24 As ToolStripSeparator Friend WithEvents VERAGWIKIToolStripMenuItem As ToolStripMenuItem Friend WithEvents GesamtsicherheitenToolStripMenuItem As ToolStripMenuItem diff --git a/Aviso/frmHauptfenster.resx b/Aviso/frmHauptfenster.resx index 9801068..b95b36c 100644 --- a/Aviso/frmHauptfenster.resx +++ b/Aviso/frmHauptfenster.resx @@ -243,9 +243,6 @@ pOTzPwAAAABJRU5ErkJggg== - - 560, 17 - 659, 17 diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index 24480f6..8b885cd 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -65,6 +65,10 @@ Public Class frmHauptfenster Public Sub New() InitializeComponent() + Me.DoubleBuffered = True + SetStyle(ControlStyles.OptimizedDoubleBuffer Or ControlStyles.UserPaint Or ControlStyles.AllPaintingInWmPaint Or ControlStyles.ResizeRedraw, True) + UpdateStyles() + Icon = cMeineFunktionenAVISO.GetProgrammIcon End Sub @@ -405,7 +409,8 @@ Public Class frmHauptfenster For Each i In FunktionenToolStripMenuItem.DropDownItems - If i.name <> "tool_BRGXLS" Then + If i.name <> "tool_BRGXLS" And i.name <> "toolOriginalATR" Then + i.Visible = False End If Next @@ -4531,9 +4536,12 @@ Public Class frmHauptfenster Process.Start("https://verag.ag/de/about-us") End Sub - Private Sub ToolStripMenuItem3_Click_1(sender As Object, e As EventArgs) Handles ToolStripMenuItem3.Click - Dim f As New frmOriginalArchiv_ATR - f.Show() + Private Sub ToolStripMenuItem3_Click_1(sender As Object, e As EventArgs) Handles toolOriginalATR.Click + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ORIGINAL_ATR", "AVISO") Then + Dim f As New frmOriginalArchiv_ATR + f.Show() + End If + End Sub Private Sub VERAGWIKIToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VERAGWIKIToolStripMenuItem.Click @@ -5611,9 +5619,12 @@ Public Class AvisoStatusFunctions Next Aviso.Abgeschlossen = value AvisoDAL.SpeichernAviso(Aviso) - Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA - Case "IMEX" : createNLC(Aviso) - End Select + + '--> Nicht mehr benötigt, alte Archiv Software IMEX + 'Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + ' Case "IMEX" : createNLC(Aviso) + 'End Select + AvisoDAL.addAenderung(AvisoID, "AKT abgeschlossen", "auf 'AKT ABGESCHLOSSEN' gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm")) 'Benachrichtigungen erledigen diff --git a/Aviso/frmLaufzettel.vb b/Aviso/frmLaufzettel.vb index a8153d0..b8d3024 100644 --- a/Aviso/frmLaufzettel.vb +++ b/Aviso/frmLaufzettel.vb @@ -8,6 +8,7 @@ Public Class frmLaufzettel Dim AVISO As VERAG_PROG_ALLGEMEIN.cAviso = Nothing Dim SENDUNG_LIST As List(Of VERAG_PROG_ALLGEMEIN.cSendungen) = Nothing Dim DIGITAL_T1 As Boolean = False + Dim DIGITAL_FISKAL_DE As Boolean = False Dim DIGITAL_Rg As Boolean = False Dim jeVP As Boolean = False Sub New() @@ -18,7 +19,7 @@ Public Class frmLaufzettel ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. End Sub - Sub New(AvisoID As Integer, SENDUNG_LIST As List(Of VERAG_PROG_ALLGEMEIN.cSendungen), DIGITAL As Boolean, DIGITAL_T1 As Boolean, DIGITAL_rg As Boolean, jeVP As Boolean) + Sub New(AvisoID As Integer, SENDUNG_LIST As List(Of VERAG_PROG_ALLGEMEIN.cSendungen), DIGITAL As Boolean, DIGITAL_T1 As Boolean, DIGITAL_rg As Boolean, DIGITAL_FISKAL_DE As Boolean, jeVP As Boolean) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() @@ -28,12 +29,13 @@ Public Class frmLaufzettel AVISO = VERAG_PROG_ALLGEMEIN.cAviso.getAvisoById(AvisoID) Me.SENDUNG_LIST = SENDUNG_LIST Me.DIGITAL = DIGITAL - Me.DIGITAL_T1 = DIGITAL_T1genl + Me.DIGITAL_T1 = DIGITAL_T1 + Me.DIGITAL_FISKAL_DE = DIGITAL_FISKAL_DE Me.DIGITAL_Rg = DIGITAL_rg Me.jeVP = jeVP End Sub - Sub New(AVISO As VERAG_PROG_ALLGEMEIN.cAviso, SENDUNG_LIST As List(Of VERAG_PROG_ALLGEMEIN.cSendungen), DIGITAL As Boolean, DIGITAL_T1 As Boolean, DIGITAL_rg As Boolean, jeVP As Boolean) + Sub New(AVISO As VERAG_PROG_ALLGEMEIN.cAviso, SENDUNG_LIST As List(Of VERAG_PROG_ALLGEMEIN.cSendungen), DIGITAL As Boolean, DIGITAL_T1 As Boolean, DIGITAL_rg As Boolean, DIGITAL_FISKAL_DE As Boolean, jeVP As Boolean) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() @@ -45,6 +47,7 @@ Public Class frmLaufzettel Me.DIGITAL = DIGITAL Me.DIGITAL_T1 = DIGITAL_T1 Me.DIGITAL_Rg = DIGITAL_rg + Me.DIGITAL_FISKAL_DE = DIGITAL_FISKAL_DE Me.jeVP = jeVP End Sub @@ -121,8 +124,24 @@ Public Class frmLaufzettel Next End If - If DIGITAL_Rg Then + If DIGITAL_FISKAL_DE Then For Each s In SENDUNG_LIST + Select Case s.tblSnd_Abfertigungsart_ID + 'Falls RECHNUNGen in den Unterlagen vorhanden, werden diese beigefügt + Case "28" ' DE-FISK + Dim ANH_LIST_SND As New List(Of VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge) + VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge.LOAD_LIST_BySendung(ANH_LIST_SND, s.tblSnd_SendungID) 'LÄDT alle Aviso-Anhänge + For Each l In ANH_LIST_SND + Select Case l.anh_Art.ToString.ToUpper + Case "RECHNUNG", "HANDELSRECHNUNG", "CMR" + dgvDigitalMailanfügen.Rows.Add(l.anh_id, l.anh_Name, l.anh_docId) + End Select + Next + End Select + Next + + ElseIf DIGITAL_Rg Then + For Each s In SENDUNG_LIST Select Case s.tblSnd_Abfertigungsart_ID 'Falls RECHNUNGen in den Unterlagen vorhanden, werden diese beigefügt Case "5", "45", "28", "26", "38" 'T1, Ü-T1, DE-FISK @@ -139,6 +158,7 @@ Public Class frmLaufzettel Next End If + 'Markierte Anhänge For Each l In ANH_LIST 'Markierte: @@ -401,6 +421,9 @@ Public Class frmLaufzettel Mail.To = "abfertigung.za-suben@zoll.bund.de" End If tX = New VERAG_PROG_ALLGEMEIN.cTextkonserve("LAUFZETTEL_DIGITAL", "LAUFZETTEL_DE_DIGITAL_SUB", "DE", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) + Case "DTB" + Mail.To = "poststelle.za-dettelbach@zoll.bund.de" + tX = New VERAG_PROG_ALLGEMEIN.cTextkonserve("LAUFZETTEL_DIGITAL", "LAUFZETTEL_DE_DIGITAL_SUB", "DE", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) Case "WAI" Mail.To = "" tX = New VERAG_PROG_ALLGEMEIN.cTextkonserve("LAUFZETTEL_DIGITAL", "LAUFZETTEL_DE_DIGITAL_WAI", "DE", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index 335955a..6c4c60e 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -149,7 +149,6 @@ Public Class frmSendungsdetailsNEU 'End Select If Not SENDUNG_LIST(CURRENT_INDEX).tblSnd_Fremdspedition Then - If SENDUNG_LIST(CURRENT_INDEX).FilialenNr = 5801 Or (SENDUNG_LIST(CURRENT_INDEX).FilialenNr.ToString = VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE And VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER) Then 'Firma=Cluster, zB Front-Office --> darf alle Firmen auswählen. Else @@ -164,6 +163,25 @@ Public Class frmSendungsdetailsNEU End If End If + + 'If UsrCntlSND_NCTSGestellungsadresse1.Controls.Count > 0 Then + ' If UsrCntlSND_NCTSGestellungsadresse1.Controls(0).GetType.ToString = GetType(usrCntlSND_ATBGestellung).ToString Then + + ' If DirectCast(UsrCntlSND_NCTSGestellungsadresse1.Controls(0), usrCntlSND_ATBGestellung).cbxATBFakturieren.CheckState = CheckState.Indeterminate Then + ' MsgBox("ATB-Gestllung: Bitte geben Sie an, ob die ATB Gestellung fakturiert (abgerechnet) werden sollte.") : Return False + ' End If + + + ' End If + 'End If + If SENDUNG_LIST(CURRENT_INDEX).tblSnd_Abfertigungsart_ID = 44 Then ' ATB GEstellung + + If SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATBFakturieren Is Nothing Then + MsgBox("ATB-Gestllung: Bitte geben Sie an, ob die ATB Gestellung fakturiert (abgerechnet) werden sollte.") : Return False + End If + + + End If End If @@ -1410,6 +1428,12 @@ Public Class frmSendungsdetailsNEU usrcntl_ATB.txtATBT1.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATB_T1, "") usrcntl_ATB.txtATBNr.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATB_Nr, "") + If SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATBFakturieren Is Nothing Then + usrcntl_ATB.cbxATBFakturieren.CheckState = CheckState.Indeterminate + Else + usrcntl_ATB.cbxATBFakturieren.Checked = CBool(SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATBFakturieren) + End If + pnlT1.Controls.Add(usrcntl_ATB) End Select @@ -1796,6 +1820,13 @@ Public Class frmSendungsdetailsNEU If pnlT1.Controls.Count > 0 AndAlso pnlT1.Controls(0).GetType Is GetType(usrCntlSND_ATBGestellung) Then SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATB_T1 = usrcntl_ATB.txtATBT1.Text SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATB_Nr = usrcntl_ATB.txtATBNr.Text + + Select Case usrcntl_ATB.cbxATBFakturieren.CheckState + Case CheckState.Indeterminate : SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATBFakturieren = Nothing + Case CheckState.Checked : SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATBFakturieren = True + Case CheckState.Unchecked : SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATBFakturieren = False + End Select + End If End Select diff --git a/Aviso/usrCntlSND_ATBGestellung.Designer.vb b/Aviso/usrCntlSND_ATBGestellung.Designer.vb index 0e9839e..e841462 100644 --- a/Aviso/usrCntlSND_ATBGestellung.Designer.vb +++ b/Aviso/usrCntlSND_ATBGestellung.Designer.vb @@ -23,17 +23,19 @@ Partial Class usrCntlSND_ATBGestellung Private Sub InitializeComponent() Me.pnlT1 = New System.Windows.Forms.Panel() + Me.txtATBNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtATBT1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label4 = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label() Me.txtT1VerzollungsadresseBestimmungszollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox() Me.Label33 = New System.Windows.Forms.Label() - Me.txtATBNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.cbxATBFakturieren = New System.Windows.Forms.CheckBox() Me.pnlT1.SuspendLayout() Me.SuspendLayout() ' 'pnlT1 ' + Me.pnlT1.Controls.Add(Me.cbxATBFakturieren) Me.pnlT1.Controls.Add(Me.txtATBNr) Me.pnlT1.Controls.Add(Me.txtATBT1) Me.pnlT1.Controls.Add(Me.Label4) @@ -45,15 +47,40 @@ Partial Class usrCntlSND_ATBGestellung Me.pnlT1.Size = New System.Drawing.Size(549, 101) Me.pnlT1.TabIndex = 0 ' + 'txtATBNr + ' + Me.txtATBNr._DateTimeOnly = False + Me.txtATBNr._numbersOnly = False + Me.txtATBNr._numbersOnlyKommastellen = "" + Me.txtATBNr._numbersOnlyTrennzeichen = True + Me.txtATBNr._Prozent = False + Me.txtATBNr._ShortDateNew = False + Me.txtATBNr._ShortDateOnly = False + Me.txtATBNr._TimeOnly = False + Me.txtATBNr._TimeOnly_Seconds = False + Me.txtATBNr._value = "" + Me.txtATBNr._Waehrung = False + Me.txtATBNr._WaehrungZeichen = True + Me.txtATBNr.ForeColor = System.Drawing.Color.Black + Me.txtATBNr.Location = New System.Drawing.Point(121, 30) + Me.txtATBNr.MaxLineLength = -1 + Me.txtATBNr.MaxLines_Warning = "" + Me.txtATBNr.MaxLines_Warning_Label = Nothing + Me.txtATBNr.Name = "txtATBNr" + Me.txtATBNr.Size = New System.Drawing.Size(269, 20) + Me.txtATBNr.TabIndex = 23 + ' 'txtATBT1 ' Me.txtATBT1._DateTimeOnly = False Me.txtATBT1._numbersOnly = False Me.txtATBT1._numbersOnlyKommastellen = "" + Me.txtATBT1._numbersOnlyTrennzeichen = True Me.txtATBT1._Prozent = False Me.txtATBT1._ShortDateNew = False Me.txtATBT1._ShortDateOnly = False Me.txtATBT1._TimeOnly = False + Me.txtATBT1._TimeOnly_Seconds = False Me.txtATBT1._value = "" Me.txtATBT1._Waehrung = False Me.txtATBT1._WaehrungZeichen = True @@ -79,7 +106,7 @@ Partial Class usrCntlSND_ATBGestellung 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(23, 75) + Me.Label3.Location = New System.Drawing.Point(23, 59) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(51, 13) Me.Label3.TabIndex = 15 @@ -99,7 +126,7 @@ Partial Class usrCntlSND_ATBGestellung Me.txtT1VerzollungsadresseBestimmungszollstelle.INVISIBLE_COLUMNS = Nothing Me.txtT1VerzollungsadresseBestimmungszollstelle.key_visible = False Me.txtT1VerzollungsadresseBestimmungszollstelle.KEYPARAM = Nothing - Me.txtT1VerzollungsadresseBestimmungszollstelle.Location = New System.Drawing.Point(121, 72) + Me.txtT1VerzollungsadresseBestimmungszollstelle.Location = New System.Drawing.Point(121, 56) Me.txtT1VerzollungsadresseBestimmungszollstelle.MaxLength = 8 Me.txtT1VerzollungsadresseBestimmungszollstelle.Name = "txtT1VerzollungsadresseBestimmungszollstelle" Me.txtT1VerzollungsadresseBestimmungszollstelle.searchActive = True @@ -121,26 +148,18 @@ Partial Class usrCntlSND_ATBGestellung Me.Label33.TabIndex = 3 Me.Label33.Text = "Vorpapier / T1:" ' - 'txtATBNr + 'cbxATBFakturieren ' - Me.txtATBNr._DateTimeOnly = False - Me.txtATBNr._numbersOnly = False - Me.txtATBNr._numbersOnlyKommastellen = "" - Me.txtATBNr._Prozent = False - Me.txtATBNr._ShortDateNew = False - Me.txtATBNr._ShortDateOnly = False - Me.txtATBNr._TimeOnly = False - Me.txtATBNr._value = "" - Me.txtATBNr._Waehrung = False - Me.txtATBNr._WaehrungZeichen = True - Me.txtATBNr.ForeColor = System.Drawing.Color.Black - Me.txtATBNr.Location = New System.Drawing.Point(121, 30) - Me.txtATBNr.MaxLineLength = -1 - Me.txtATBNr.MaxLines_Warning = "" - Me.txtATBNr.MaxLines_Warning_Label = Nothing - Me.txtATBNr.Name = "txtATBNr" - Me.txtATBNr.Size = New System.Drawing.Size(269, 20) - Me.txtATBNr.TabIndex = 23 + Me.cbxATBFakturieren.AutoSize = True + Me.cbxATBFakturieren.Checked = True + Me.cbxATBFakturieren.CheckState = System.Windows.Forms.CheckState.Indeterminate + Me.cbxATBFakturieren.Location = New System.Drawing.Point(121, 80) + Me.cbxATBFakturieren.Name = "cbxATBFakturieren" + Me.cbxATBFakturieren.Size = New System.Drawing.Size(153, 17) + Me.cbxATBFakturieren.TabIndex = 24 + Me.cbxATBFakturieren.Text = "ATB-Gestellung fakturieren" + Me.cbxATBFakturieren.ThreeState = True + Me.cbxATBFakturieren.UseVisualStyleBackColor = True ' 'usrCntlSND_ATBGestellung ' @@ -161,4 +180,5 @@ Partial Class usrCntlSND_ATBGestellung Friend WithEvents txtATBT1 As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label4 As Label Friend WithEvents txtATBNr As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents cbxATBFakturieren As CheckBox End Class diff --git a/Aviso/usrcntlAktDetails.Designer.vb b/Aviso/usrcntlAktDetails.Designer.vb index d71cef7..bc0d264 100644 --- a/Aviso/usrcntlAktDetails.Designer.vb +++ b/Aviso/usrcntlAktDetails.Designer.vb @@ -23,17 +23,17 @@ Partial Class usrcntlAktDetails _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrcntlAktDetails)) - Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.pnlDetailsRechts = New System.Windows.Forms.Panel() Me.Panel3 = New System.Windows.Forms.Panel() Me.SplitContainer = New System.Windows.Forms.SplitContainer() @@ -106,6 +106,7 @@ Partial Class usrcntlAktDetails Me.txtMAinfo_Vorgeschrieben = New System.Windows.Forms.TextBox() Me.txtMAinfo_VorbereitetQs = New System.Windows.Forms.TextBox() Me.Panel8 = New System.Windows.Forms.Panel() + Me.lblAktUebernommen = New System.Windows.Forms.Label() Me.lblLKWChat_MsgCnt = New System.Windows.Forms.Label() Me.lblBarZuKassierenSumme = New System.Windows.Forms.Label() Me.picAVISOMessenger = New System.Windows.Forms.PictureBox() @@ -125,11 +126,10 @@ Partial Class usrcntlAktDetails Me.txtFrächter = New System.Windows.Forms.TextBox() Me.txtAuftraggeber = New System.Windows.Forms.TextBox() Me.pnlAbgeschlossen = New System.Windows.Forms.Panel() - Me.Label2 = New System.Windows.Forms.Label() Me.pic = New System.Windows.Forms.PictureBox() + Me.Label2 = New System.Windows.Forms.Label() Me.lklAuswahlAufheben = New System.Windows.Forms.LinkLabel() Me.txtLKWID = New System.Windows.Forms.TextBox() - Me.lblAktUebernommen = New System.Windows.Forms.Label() Me.FlowLayoutPanel = New System.Windows.Forms.FlowLayoutPanel() Me.Panel9 = New System.Windows.Forms.Panel() Me.btnErfasst = New System.Windows.Forms.Button() @@ -174,6 +174,7 @@ Partial Class usrcntlAktDetails Me.btnÄndern = New System.Windows.Forms.Button() Me.btnTV = New System.Windows.Forms.Button() Me.Button10 = New System.Windows.Forms.Button() + Me.cbxLZDeFisk = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components) Me.pnlDetailsRechts.SuspendLayout() Me.Panel3.SuspendLayout() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() @@ -604,46 +605,46 @@ Partial Class usrcntlAktDetails Me.dgvSendungen.AllowUserToAddRows = False Me.dgvSendungen.AllowUserToDeleteRows = False Me.dgvSendungen.AllowUserToResizeRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSendungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle11.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSendungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11 Me.dgvSendungen.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle2.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle2.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSendungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle12.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle12.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSendungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle12 Me.dgvSendungen.ColumnHeadersHeight = 34 Me.dgvSendungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvSendungen.DefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvSendungen.DefaultCellStyle = DataGridViewCellStyle13 Me.dgvSendungen.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvSendungen.Location = New System.Drawing.Point(0, 0) Me.dgvSendungen.MultiSelect = False Me.dgvSendungen.Name = "dgvSendungen" Me.dgvSendungen.ReadOnly = True - DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSendungen.RowHeadersDefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSendungen.RowHeadersDefaultCellStyle = DataGridViewCellStyle14 Me.dgvSendungen.RowHeadersVisible = False Me.dgvSendungen.RowHeadersWidth = 62 Me.dgvSendungen.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSendungen.RowsDefaultCellStyle = DataGridViewCellStyle5 + DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSendungen.RowsDefaultCellStyle = DataGridViewCellStyle15 Me.dgvSendungen.RowTemplate.Height = 20 Me.dgvSendungen.RowTemplate.ReadOnly = True Me.dgvSendungen.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] @@ -698,6 +699,8 @@ Partial Class usrcntlAktDetails Me.Panel4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Panel4.BackColor = System.Drawing.Color.PapayaWhip Me.Panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Panel4.Controls.Add(Me.cbxLZDeFisk) + Me.Panel4.Controls.Add(Me.cbxLZT1) Me.Panel4.Controls.Add(Me.Button2) Me.Panel4.Controls.Add(Me.cbxVPSplit) Me.Panel4.Controls.Add(Me.btnLZDruckDIGITAL) @@ -713,7 +716,6 @@ Partial Class usrcntlAktDetails Me.Panel4.Controls.Add(Me.btnDipoListeEmail) Me.Panel4.Controls.Add(Me.btnDispohaft) Me.Panel4.Controls.Add(Me.cbxLZRg) - Me.Panel4.Controls.Add(Me.cbxLZT1) Me.Panel4.Location = New System.Drawing.Point(203, 27) Me.Panel4.Name = "Panel4" Me.Panel4.Size = New System.Drawing.Size(265, 227) @@ -938,11 +940,12 @@ Partial Class usrcntlAktDetails Me.cbxLZRg.Checked_value = False Me.cbxLZRg.CheckedValue = False Me.cbxLZRg.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbxLZRg.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) Me.cbxLZRg.Location = New System.Drawing.Point(134, 93) Me.cbxLZRg.Name = "cbxLZRg" - Me.cbxLZRg.Size = New System.Drawing.Size(88, 17) + Me.cbxLZRg.Size = New System.Drawing.Size(41, 17) Me.cbxLZRg.TabIndex = 115 - Me.cbxLZRg.Text = "Rechnungen" + Me.cbxLZRg.Text = "RG" Me.cbxLZRg.UseVisualStyleBackColor = True ' 'cbxLZT1 @@ -951,9 +954,10 @@ Partial Class usrcntlAktDetails Me.cbxLZT1.AutoSize = True Me.cbxLZT1.Checked_value = False Me.cbxLZT1.CheckedValue = False - Me.cbxLZT1.Location = New System.Drawing.Point(223, 93) + Me.cbxLZT1.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) + Me.cbxLZT1.Location = New System.Drawing.Point(172, 93) Me.cbxLZT1.Name = "cbxLZT1" - Me.cbxLZT1.Size = New System.Drawing.Size(39, 17) + Me.cbxLZT1.Size = New System.Drawing.Size(37, 17) Me.cbxLZT1.TabIndex = 114 Me.cbxLZT1.Text = "T1" Me.cbxLZT1.UseVisualStyleBackColor = True @@ -979,46 +983,46 @@ Partial Class usrcntlAktDetails Me.gridVermerke.AllowUserToAddRows = False Me.gridVermerke.AllowUserToDeleteRows = False Me.gridVermerke.AllowUserToResizeRows = False - DataGridViewCellStyle6.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6 + DataGridViewCellStyle16.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle16 Me.gridVermerke.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle7.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle7.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle7 + DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle17.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle17.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle17 Me.gridVermerke.ColumnHeadersHeight = 34 Me.gridVermerke.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridVermerke.DefaultCellStyle = DataGridViewCellStyle8 + DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridVermerke.DefaultCellStyle = DataGridViewCellStyle18 Me.gridVermerke.Dock = System.Windows.Forms.DockStyle.Fill Me.gridVermerke.Location = New System.Drawing.Point(0, 30) Me.gridVermerke.MultiSelect = False Me.gridVermerke.Name = "gridVermerke" Me.gridVermerke.ReadOnly = True - DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.RowHeadersDefaultCellStyle = DataGridViewCellStyle9 + DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.RowHeadersDefaultCellStyle = DataGridViewCellStyle19 Me.gridVermerke.RowHeadersVisible = False Me.gridVermerke.RowHeadersWidth = 62 Me.gridVermerke.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle10 + DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle20 Me.gridVermerke.RowTemplate.Height = 20 Me.gridVermerke.RowTemplate.ReadOnly = True Me.gridVermerke.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] @@ -1346,6 +1350,20 @@ Partial Class usrcntlAktDetails Me.Panel8.Size = New System.Drawing.Size(575, 120) Me.Panel8.TabIndex = 92 ' + 'lblAktUebernommen + ' + Me.lblAktUebernommen.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblAktUebernommen.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblAktUebernommen.ForeColor = System.Drawing.Color.Green + Me.lblAktUebernommen.Location = New System.Drawing.Point(208, 75) + Me.lblAktUebernommen.Name = "lblAktUebernommen" + Me.lblAktUebernommen.Size = New System.Drawing.Size(205, 38) + Me.lblAktUebernommen.TabIndex = 102 + Me.lblAktUebernommen.Text = "Akt übernommen!" + Me.lblAktUebernommen.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.lblAktUebernommen.Visible = False + ' 'lblLKWChat_MsgCnt ' Me.lblLKWChat_MsgCnt.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) @@ -1617,6 +1635,16 @@ Partial Class usrcntlAktDetails Me.pnlAbgeschlossen.TabIndex = 103 Me.pnlAbgeschlossen.Visible = False ' + 'pic + ' + Me.pic.BackgroundImage = Global.AVISO.My.Resources.Resources.ok + Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.pic.Location = New System.Drawing.Point(0, 9) + Me.pic.Name = "pic" + Me.pic.Size = New System.Drawing.Size(38, 27) + Me.pic.TabIndex = 0 + Me.pic.TabStop = False + ' 'Label2 ' Me.Label2.AutoSize = True @@ -1629,16 +1657,6 @@ Partial Class usrcntlAktDetails Me.Label2.TabIndex = 105 Me.Label2.Text = "Abgeschlossen" ' - 'pic - ' - Me.pic.BackgroundImage = Global.AVISO.My.Resources.Resources.ok - Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.pic.Location = New System.Drawing.Point(0, 9) - Me.pic.Name = "pic" - Me.pic.Size = New System.Drawing.Size(38, 27) - Me.pic.TabIndex = 0 - Me.pic.TabStop = False - ' 'lklAuswahlAufheben ' Me.lklAuswahlAufheben.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -1668,20 +1686,6 @@ Partial Class usrcntlAktDetails Me.txtLKWID.TabStop = False Me.txtLKWID.Text = "000000" ' - 'lblAktUebernommen - ' - Me.lblAktUebernommen.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.lblAktUebernommen.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAktUebernommen.ForeColor = System.Drawing.Color.Green - Me.lblAktUebernommen.Location = New System.Drawing.Point(208, 75) - Me.lblAktUebernommen.Name = "lblAktUebernommen" - Me.lblAktUebernommen.Size = New System.Drawing.Size(205, 38) - Me.lblAktUebernommen.TabIndex = 102 - Me.lblAktUebernommen.Text = "Akt übernommen!" - Me.lblAktUebernommen.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.lblAktUebernommen.Visible = False - ' 'FlowLayoutPanel ' Me.FlowLayoutPanel.AutoSize = True @@ -2241,6 +2245,20 @@ Partial Class usrcntlAktDetails Me.Button10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button10.UseVisualStyleBackColor = False ' + 'cbxLZDeFisk + ' + Me.cbxLZDeFisk._value = "" + Me.cbxLZDeFisk.AutoSize = True + Me.cbxLZDeFisk.Checked_value = False + Me.cbxLZDeFisk.CheckedValue = False + Me.cbxLZDeFisk.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) + Me.cbxLZDeFisk.Location = New System.Drawing.Point(205, 93) + Me.cbxLZDeFisk.Name = "cbxLZDeFisk" + Me.cbxLZDeFisk.Size = New System.Drawing.Size(62, 17) + Me.cbxLZDeFisk.TabIndex = 118 + Me.cbxLZDeFisk.Text = "DE Fisk" + Me.cbxLZDeFisk.UseVisualStyleBackColor = True + ' 'usrcntlAktDetails ' Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None @@ -2444,4 +2462,5 @@ Partial Class usrcntlAktDetails Friend WithEvents lblSNDChat_MsgCnt As Label Friend WithEvents picAVISOMessengerSNDChat As PictureBox Friend WithEvents conVermerkLöschenNew As ToolStripMenuItem + Friend WithEvents cbxLZDeFisk As VERAG_PROG_ALLGEMEIN.MyCheckbox End Class diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index 46ede42..fc8b7e7 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -107,6 +107,7 @@ Public Class usrcntlAktDetails Case "NKD" lblFiskde.Visible = False txtSndFiskalDE.Visible = False + Case "SUB", "NEU" txtSndFremd.Visible = True lblSndFremd.Visible = True @@ -313,6 +314,9 @@ Public Class usrcntlAktDetails txtAuftraggeber.Cursor = IIf(AvisiererKdNr > 0, Cursors.Hand, Cursors.Default) + cbxLZDeFisk.Checked = False + If AVISO.Grenzstelle = "DTB" Then cbxLZDeFisk.Checked = True + txtFrächter.Text = AVISO.Frächter @@ -3051,7 +3055,9 @@ Public Class usrcntlAktDetails End Sub Private Sub Button10_Click(sender As Object, e As EventArgs) Handles btnLZDruckDIGITAL.Click, btnLZDruck.Click - Dim f As New frmLaufzettel(AVISO, Nothing, (sender Is btnLZDruckDIGITAL), cbxLZT1.Checked, cbxLZRg.Checked, cbxVPSplit.Checked) + Dim f As New frmLaufzettel(AVISO, Nothing, (sender Is btnLZDruckDIGITAL), cbxLZT1.Checked, cbxLZRg.Checked, cbxLZDeFisk.Checked, cbxVPSplit.Checked) + + f.ShowDialog() Panel4.Visible = False @@ -3149,6 +3155,9 @@ Public Class usrcntlAktDetails Case "WAI" Mail.To = "" tX = New VERAG_PROG_ALLGEMEIN.cTextkonserve("LAUFZETTEL_DIGITAL", "LAUFZETTEL_DE_DIGITAL_WAI", "DE", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) + Case "DTB" + Mail.To = "" + tX = New VERAG_PROG_ALLGEMEIN.cTextkonserve("LAUFZETTEL_DIGITAL", "LAUFZETTEL_DE_DIGITAL_DTB", "DE", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) Case "SBG" Mail.To = "" tX = New VERAG_PROG_ALLGEMEIN.cTextkonserve("LAUFZETTEL_DIGITAL", "LAUFZETTEL_DE_DIGITAL_SBG", "DE", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) @@ -3185,7 +3194,22 @@ Public Class usrcntlAktDetails Next End If - If cbxLZRg.Visible AndAlso cbxLZRg.Checked Then + If cbxLZDeFisk.Visible AndAlso cbxLZDeFisk.Checked Then + For Each s In SENDUNG_LIST + Select Case s.tblSnd_Abfertigungsart_ID + 'Falls RECHNUNGen in den Unterlagen vorhanden, werden diese beigefügt + Case "28" 'T1, Ü-T1, DE-FISK + Dim ANH_LIST_SND As New List(Of VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge) + VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge.LOAD_LIST_BySendung(ANH_LIST_SND, s.tblSnd_SendungID) 'LÄDT alle Aviso-Anhänge + For Each l In ANH_LIST_SND + Select Case l.anh_Art.ToString.ToUpper + Case "RECHNUNG", "HANDELSRECHNUNG", "CMR" + Mail.Attachments.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(l.anh_docId), Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue) + End Select + Next + End Select + Next + ElseIf cbxLZRg.Visible AndAlso cbxLZRg.Checked Then For Each s In SENDUNG_LIST Select Case s.tblSnd_Abfertigungsart_ID 'Falls RECHNUNGen in den Unterlagen vorhanden, werden diese beigefügt @@ -3201,6 +3225,8 @@ Public Class usrcntlAktDetails End Select Next End If + + End If 'Markierte Anhänge @@ -3644,7 +3670,7 @@ Public Class usrcntlAktDetails End Sub Private Sub Button2_Click_1(sender As Object, e As EventArgs) Handles Button2.Click - Dim f As New frmLaufzettel(AVISO, Nothing, True, True, True, cbxVPSplit.Checked) + Dim f As New frmLaufzettel(AVISO, Nothing, True, True, True, True, cbxVPSplit.Checked) f.ShowDialog() End Sub @@ -3761,5 +3787,6 @@ Public Class usrcntlAktDetails End If End Sub + End Class