diff --git a/Aviso/App.config b/Aviso/App.config index cf5284a..46899ba 100644 --- a/Aviso/App.config +++ b/Aviso/App.config @@ -90,12 +90,16 @@ - + + + + + diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index 93ce438..6491167 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -148,8 +148,8 @@ False C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\BouncyCastle.Crypto.dll - - F:\PROGRAMMIERUNG\dll\ActiveReports18\allDll\BouncyCastle.Cryptography.dll + + ..\packages\BouncyCastle.Cryptography.2.6.2\lib\net461\BouncyCastle.Cryptography.dll False @@ -201,32 +201,44 @@ ..\Gemeinsames\bin\Debug\Gemeinsames.dll - - ..\packages\itext7.7.1.11\lib\net40\itext.barcodes.dll + + ..\packages\itext.9.6.0\lib\net461\itext.barcodes.dll - - ..\packages\itext7.7.1.11\lib\net40\itext.forms.dll + + ..\packages\itext.bouncy-castle-adapter.9.6.0\lib\net461\itext.bouncy-castle-adapter.dll - - ..\packages\itext7.7.1.11\lib\net40\itext.io.dll + + ..\packages\itext.9.6.0\lib\net461\itext.bouncy-castle-connector.dll - - ..\packages\itext7.7.1.11\lib\net40\itext.kernel.dll + + ..\packages\itext.commons.9.6.0\lib\net461\itext.commons.dll - - ..\packages\itext7.7.1.11\lib\net40\itext.layout.dll + + ..\packages\itext.9.6.0\lib\net461\itext.forms.dll - - ..\packages\itext7.7.1.11\lib\net40\itext.pdfa.dll + + ..\packages\itext.9.6.0\lib\net461\itext.io.dll - - ..\packages\itext7.7.1.11\lib\net40\itext.sign.dll + + ..\packages\itext.9.6.0\lib\net461\itext.kernel.dll - - ..\packages\itext7.7.1.11\lib\net40\itext.styledxmlparser.dll + + ..\packages\itext.9.6.0\lib\net461\itext.layout.dll - - ..\packages\itext7.7.1.11\lib\net40\itext.svg.dll + + ..\packages\itext.9.6.0\lib\net461\itext.pdfa.dll + + + ..\packages\itext.9.6.0\lib\net461\itext.pdfua.dll + + + ..\packages\itext.9.6.0\lib\net461\itext.sign.dll + + + ..\packages\itext.9.6.0\lib\net461\itext.styledxmlparser.dll + + + ..\packages\itext.9.6.0\lib\net461\itext.svg.dll False @@ -397,8 +409,8 @@ ..\..\..\dll\ASP.NET\Microsoft.AspNetCore.Http.Abstractions.dll - - ..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll @@ -407,15 +419,27 @@ ..\..\..\dll\ASP.NET\Microsoft.Extensions.Configuration.Abstractions.dll - - ..\..\..\dll\ASP.NET\Microsoft.Extensions.DependencyInjection.dll + + ..\packages\Microsoft.Extensions.DependencyInjection.5.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.dll - - ..\..\..\dll\ASP.NET\Microsoft.Extensions.DependencyInjection.Abstractions.dll + + ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.5.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.Abstractions.dll ..\..\..\dll\ASP.NET\Microsoft.Extensions.Hosting.dll + + ..\packages\Microsoft.Extensions.Logging.5.0.0\lib\net461\Microsoft.Extensions.Logging.dll + + + ..\packages\Microsoft.Extensions.Logging.Abstractions.5.0.0\lib\net461\Microsoft.Extensions.Logging.Abstractions.dll + + + ..\packages\Microsoft.Extensions.Options.5.0.0\lib\net461\Microsoft.Extensions.Options.dll + + + ..\packages\Microsoft.Extensions.Primitives.5.0.0\lib\net461\Microsoft.Extensions.Primitives.dll + True @@ -455,6 +479,9 @@ + + ..\packages\System.Diagnostics.DiagnosticSource.5.0.0\lib\net46\System.Diagnostics.DiagnosticSource.dll + @@ -501,6 +528,9 @@ + + ..\packages\System.Security.AccessControl.6.0.1\lib\net461\System.Security.AccessControl.dll + ..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll True @@ -524,13 +554,19 @@ True True + + ..\packages\System.Security.Cryptography.Xml.6.0.2\lib\net461\System.Security.Cryptography.Xml.dll + + + ..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll + ..\packages\System.Text.Encoding.CodePages.8.0.0\lib\net462\System.Text.Encoding.CodePages.dll - - ..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 5d87ae2..0b15f2d 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 62f3ce4..f95d68c 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 DataGridViewCellStyle10 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 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 DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle31 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle32 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle33 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle34 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle35 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle36 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) @@ -99,6 +99,7 @@ Partial Class frmHauptfenster Me.NEUToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AMBToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DTBToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.KLIPPHAUSENToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SpracheWechselnToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DeutschToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.EnglishToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -424,7 +425,9 @@ Partial Class frmHauptfenster Me.UsrCntlBenachrichtigungen2 = New AVISO.usrCntlBenachrichtigungen() Me.Panel5 = New System.Windows.Forms.Panel() Me.Panel7 = New System.Windows.Forms.Panel() - Me.KLIPPHAUSENToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripMenuItem23 = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripMenuItem25 = New System.Windows.Forms.ToolStripMenuItem() Me.conMenuAviso.SuspendLayout() Me.MenuStrip1.SuspendLayout() Me.pnlDetailsRechts.SuspendLayout() @@ -843,46 +846,52 @@ Partial Class frmHauptfenster 'SUBToolStripMenuItem ' Me.SUBToolStripMenuItem.Name = "SUBToolStripMenuItem" - Me.SUBToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.SUBToolStripMenuItem.Size = New System.Drawing.Size(150, 22) Me.SUBToolStripMenuItem.Text = "SUB" ' 'SBGToolStripMenuItem ' Me.SBGToolStripMenuItem.Name = "SBGToolStripMenuItem" - Me.SBGToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.SBGToolStripMenuItem.Size = New System.Drawing.Size(150, 22) Me.SBGToolStripMenuItem.Text = "SBG" ' 'WAIToolStripMenuItem ' Me.WAIToolStripMenuItem.Name = "WAIToolStripMenuItem" - Me.WAIToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.WAIToolStripMenuItem.Size = New System.Drawing.Size(150, 22) Me.WAIToolStripMenuItem.Text = "WAI" ' 'NKDToolStripMenuItem ' Me.NKDToolStripMenuItem.Name = "NKDToolStripMenuItem" - Me.NKDToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.NKDToolStripMenuItem.Size = New System.Drawing.Size(150, 22) Me.NKDToolStripMenuItem.Text = "NKD" ' 'NEUToolStripMenuItem ' Me.NEUToolStripMenuItem.Name = "NEUToolStripMenuItem" - Me.NEUToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.NEUToolStripMenuItem.Size = New System.Drawing.Size(150, 22) Me.NEUToolStripMenuItem.Text = "NEU" ' 'AMBToolStripMenuItem ' Me.AMBToolStripMenuItem.Name = "AMBToolStripMenuItem" - Me.AMBToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.AMBToolStripMenuItem.Size = New System.Drawing.Size(150, 22) Me.AMBToolStripMenuItem.Text = "AMB" Me.AMBToolStripMenuItem.Visible = False ' 'DTBToolStripMenuItem ' Me.DTBToolStripMenuItem.Name = "DTBToolStripMenuItem" - Me.DTBToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.DTBToolStripMenuItem.Size = New System.Drawing.Size(150, 22) Me.DTBToolStripMenuItem.Text = "DTB" ' + 'KLIPPHAUSENToolStripMenuItem + ' + Me.KLIPPHAUSENToolStripMenuItem.Name = "KLIPPHAUSENToolStripMenuItem" + Me.KLIPPHAUSENToolStripMenuItem.Size = New System.Drawing.Size(150, 22) + Me.KLIPPHAUSENToolStripMenuItem.Text = "KLIPPHAUSEN" + ' 'SpracheWechselnToolStripMenuItem ' Me.SpracheWechselnToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DeutschToolStripMenuItem, Me.EnglishToolStripMenuItem, Me.TürkischToolStripMenuItem}) @@ -1294,7 +1303,7 @@ Partial Class frmHauptfenster 'ToolStripFormulare ' Me.ToolStripFormulare.BackColor = System.Drawing.Color.White - Me.ToolStripFormulare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MANAGERToolStripMenuItem, Me.ToolStripSeparator3, Me.MailvorlagenToolStripMenuItem, Me.ToolStripMenuItem2, Me.ToolStripMenuItem7, Me.ToolStripMenuItem12, Me.ToolStripMenuItem15, Me.ToolStripMenuItem18, Me.AuftragÜberwachungsdokumentToolStripMenuItem, Me.toolVUB, Me.toolVPCreditreform, Me.ToolStripSeparator9, Me.VerzollungsunterlagenToolStripMenuItem, Me.ToolStripMenuItem11, Me.ToolStripSeparator6, Me.WAIDHAUSToolStripMenuItem, Me.ToolStripSeparator13, Me.EinheitspapierToolStripMenuItem, Me.CMRToolStripMenuItem, Me.Einheitspapier0735VersandverfahrenToolStripMenuItem, Me.CarnetTIRToolStripMenuItem, Me.CarnetTIRALTToolStripMenuItem}) + Me.ToolStripFormulare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MANAGERToolStripMenuItem, Me.ToolStripSeparator3, Me.MailvorlagenToolStripMenuItem, Me.ToolStripMenuItem2, Me.ToolStripMenuItem7, Me.ToolStripMenuItem12, Me.ToolStripMenuItem15, Me.ToolStripMenuItem18, Me.AuftragÜberwachungsdokumentToolStripMenuItem, Me.toolVUB, Me.toolVPCreditreform, Me.ToolStripSeparator9, Me.VerzollungsunterlagenToolStripMenuItem, Me.ToolStripMenuItem11, Me.ToolStripSeparator6, Me.WAIDHAUSToolStripMenuItem, Me.ToolStripMenuItem3, Me.ToolStripSeparator13, Me.EinheitspapierToolStripMenuItem, Me.CMRToolStripMenuItem, Me.Einheitspapier0735VersandverfahrenToolStripMenuItem, Me.CarnetTIRToolStripMenuItem, Me.CarnetTIRALTToolStripMenuItem}) Me.ToolStripFormulare.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripFormulare.ForeColor = System.Drawing.Color.Black Me.ToolStripFormulare.ImageAlign = System.Drawing.ContentAlignment.BottomRight @@ -1308,20 +1317,20 @@ Partial Class frmHauptfenster Me.MANAGERToolStripMenuItem.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Bold) Me.MANAGERToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.android_note Me.MANAGERToolStripMenuItem.Name = "MANAGERToolStripMenuItem" - Me.MANAGERToolStripMenuItem.Size = New System.Drawing.Size(277, 22) + Me.MANAGERToolStripMenuItem.Size = New System.Drawing.Size(285, 30) Me.MANAGERToolStripMenuItem.Text = "Formular - Manager" ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(274, 6) + Me.ToolStripSeparator3.Size = New System.Drawing.Size(282, 6) ' 'MailvorlagenToolStripMenuItem ' Me.MailvorlagenToolStripMenuItem.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Bold) Me.MailvorlagenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.stift Me.MailvorlagenToolStripMenuItem.Name = "MailvorlagenToolStripMenuItem" - Me.MailvorlagenToolStripMenuItem.Size = New System.Drawing.Size(277, 22) + Me.MailvorlagenToolStripMenuItem.Size = New System.Drawing.Size(285, 30) Me.MailvorlagenToolStripMenuItem.Text = "Mailvorlagen" Me.MailvorlagenToolStripMenuItem.Visible = False ' @@ -1329,7 +1338,7 @@ Partial Class frmHauptfenster ' Me.ToolStripMenuItem2.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolStrVM_de, Me.ZollvollmachtDEFiskalToolStripMenuItem, Me.toolStrVM_at, Me.toolStrVM_at4200, Me.ZollvollmachtATEVToolStripMenuItem}) Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2" - Me.ToolStripMenuItem2.Size = New System.Drawing.Size(277, 22) + Me.ToolStripMenuItem2.Size = New System.Drawing.Size(285, 30) Me.ToolStripMenuItem2.Text = "Vollmachten" ' 'toolStrVM_de @@ -1365,38 +1374,38 @@ Partial Class frmHauptfenster 'ToolStripMenuItem7 ' Me.ToolStripMenuItem7.Name = "ToolStripMenuItem7" - Me.ToolStripMenuItem7.Size = New System.Drawing.Size(277, 22) + Me.ToolStripMenuItem7.Size = New System.Drawing.Size(285, 30) Me.ToolStripMenuItem7.Text = "Gestellungsgarantien" ' 'ToolStripMenuItem12 ' Me.ToolStripMenuItem12.Name = "ToolStripMenuItem12" - Me.ToolStripMenuItem12.Size = New System.Drawing.Size(277, 22) + Me.ToolStripMenuItem12.Size = New System.Drawing.Size(285, 30) Me.ToolStripMenuItem12.Text = "Importaviso" ' 'ToolStripMenuItem15 ' Me.ToolStripMenuItem15.Name = "ToolStripMenuItem15" - Me.ToolStripMenuItem15.Size = New System.Drawing.Size(277, 22) + Me.ToolStripMenuItem15.Size = New System.Drawing.Size(285, 30) Me.ToolStripMenuItem15.Text = "Dispoliste" ' 'ToolStripMenuItem18 ' Me.ToolStripMenuItem18.Name = "ToolStripMenuItem18" - Me.ToolStripMenuItem18.Size = New System.Drawing.Size(277, 22) + Me.ToolStripMenuItem18.Size = New System.Drawing.Size(285, 30) Me.ToolStripMenuItem18.Text = "Verzollungspreise" ' 'AuftragÜberwachungsdokumentToolStripMenuItem ' Me.AuftragÜberwachungsdokumentToolStripMenuItem.Name = "AuftragÜberwachungsdokumentToolStripMenuItem" - Me.AuftragÜberwachungsdokumentToolStripMenuItem.Size = New System.Drawing.Size(277, 22) + Me.AuftragÜberwachungsdokumentToolStripMenuItem.Size = New System.Drawing.Size(285, 30) Me.AuftragÜberwachungsdokumentToolStripMenuItem.Text = "Auftrag Überwachungsdokument" ' 'toolVUB ' Me.toolVUB.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VUBVERAGSpeditionAGToolStripMenuItem, Me.VeragCustomsServiceToolStripMenuItem}) Me.toolVUB.Name = "toolVUB" - Me.toolVUB.Size = New System.Drawing.Size(277, 22) + Me.toolVUB.Size = New System.Drawing.Size(285, 30) Me.toolVUB.Text = "VUB" ' 'VUBVERAGSpeditionAGToolStripMenuItem @@ -1414,37 +1423,37 @@ Partial Class frmHauptfenster 'toolVPCreditreform ' Me.toolVPCreditreform.Name = "toolVPCreditreform" - Me.toolVPCreditreform.Size = New System.Drawing.Size(277, 22) + Me.toolVPCreditreform.Size = New System.Drawing.Size(285, 30) Me.toolVPCreditreform.Text = "Bonitätsauskunft (Creditreform)" Me.toolVPCreditreform.Visible = False ' 'ToolStripSeparator9 ' Me.ToolStripSeparator9.Name = "ToolStripSeparator9" - Me.ToolStripSeparator9.Size = New System.Drawing.Size(274, 6) + Me.ToolStripSeparator9.Size = New System.Drawing.Size(282, 6) ' 'VerzollungsunterlagenToolStripMenuItem ' Me.VerzollungsunterlagenToolStripMenuItem.Name = "VerzollungsunterlagenToolStripMenuItem" - Me.VerzollungsunterlagenToolStripMenuItem.Size = New System.Drawing.Size(277, 22) + Me.VerzollungsunterlagenToolStripMenuItem.Size = New System.Drawing.Size(285, 30) Me.VerzollungsunterlagenToolStripMenuItem.Text = "Verzollungsunterlagen" ' 'ToolStripMenuItem11 ' Me.ToolStripMenuItem11.Name = "ToolStripMenuItem11" - Me.ToolStripMenuItem11.Size = New System.Drawing.Size(277, 22) + Me.ToolStripMenuItem11.Size = New System.Drawing.Size(285, 30) Me.ToolStripMenuItem11.Text = "Verzollungsunterlagen BAR" ' 'ToolStripSeparator6 ' Me.ToolStripSeparator6.Name = "ToolStripSeparator6" - Me.ToolStripSeparator6.Size = New System.Drawing.Size(274, 6) + Me.ToolStripSeparator6.Size = New System.Drawing.Size(282, 6) ' 'WAIDHAUSToolStripMenuItem ' Me.WAIDHAUSToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem8, Me.ToolStripMenuItem9, Me.AnnahmeblattIMPORTToolStripMenuItem, Me.AnnahmeblattEXPORTToolStripMenuItem, Me.ChecklisteVerwahrlagerToolStripMenuItem}) Me.WAIDHAUSToolStripMenuItem.Name = "WAIDHAUSToolStripMenuItem" - Me.WAIDHAUSToolStripMenuItem.Size = New System.Drawing.Size(277, 22) + Me.WAIDHAUSToolStripMenuItem.Size = New System.Drawing.Size(285, 30) Me.WAIDHAUSToolStripMenuItem.Text = "WAIDHAUS" ' 'ToolStripMenuItem8 @@ -1480,36 +1489,36 @@ Partial Class frmHauptfenster 'ToolStripSeparator13 ' Me.ToolStripSeparator13.Name = "ToolStripSeparator13" - Me.ToolStripSeparator13.Size = New System.Drawing.Size(274, 6) + Me.ToolStripSeparator13.Size = New System.Drawing.Size(282, 6) ' 'EinheitspapierToolStripMenuItem ' Me.EinheitspapierToolStripMenuItem.Name = "EinheitspapierToolStripMenuItem" - Me.EinheitspapierToolStripMenuItem.Size = New System.Drawing.Size(277, 22) + Me.EinheitspapierToolStripMenuItem.Size = New System.Drawing.Size(285, 30) Me.EinheitspapierToolStripMenuItem.Text = "Einheitspapier 0777 (Vereinfachte ZA)" ' 'CMRToolStripMenuItem ' Me.CMRToolStripMenuItem.Name = "CMRToolStripMenuItem" - Me.CMRToolStripMenuItem.Size = New System.Drawing.Size(277, 22) + Me.CMRToolStripMenuItem.Size = New System.Drawing.Size(285, 30) Me.CMRToolStripMenuItem.Text = "CMR" ' 'Einheitspapier0735VersandverfahrenToolStripMenuItem ' Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Name = "Einheitspapier0735VersandverfahrenToolStripMenuItem" - Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Size = New System.Drawing.Size(277, 22) + Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Size = New System.Drawing.Size(285, 30) Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Text = "Einheitspapier 0735 (Versandverfahren)" ' 'CarnetTIRToolStripMenuItem ' Me.CarnetTIRToolStripMenuItem.Name = "CarnetTIRToolStripMenuItem" - Me.CarnetTIRToolStripMenuItem.Size = New System.Drawing.Size(277, 22) + Me.CarnetTIRToolStripMenuItem.Size = New System.Drawing.Size(285, 30) Me.CarnetTIRToolStripMenuItem.Text = "Carnet TIR" ' 'CarnetTIRALTToolStripMenuItem ' Me.CarnetTIRALTToolStripMenuItem.Name = "CarnetTIRALTToolStripMenuItem" - Me.CarnetTIRALTToolStripMenuItem.Size = New System.Drawing.Size(277, 22) + Me.CarnetTIRALTToolStripMenuItem.Size = New System.Drawing.Size(285, 30) Me.CarnetTIRALTToolStripMenuItem.Text = "Carnet TIR (ALT)" ' 'mnuFragezeichen @@ -2714,38 +2723,38 @@ Partial Class frmHauptfenster Me.gridMyAviso.AllowUserToDeleteRows = False Me.gridMyAviso.AllowUserToOrderColumns = True Me.gridMyAviso.AllowUserToResizeRows = False - DataGridViewCellStyle10.BackColor = System.Drawing.Color.Azure - Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10 + DataGridViewCellStyle28.BackColor = System.Drawing.Color.Azure + Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle28 Me.gridMyAviso.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridMyAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle11 + DataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle29.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + DataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridMyAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle29 Me.gridMyAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle12 + DataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle30.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle30.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle30.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle30.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle30.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle30 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 - DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle13 + DataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle31.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle31 Me.gridMyAviso.RowHeadersVisible = False Me.gridMyAviso.RowHeadersWidth = 62 Me.gridMyAviso.Size = New System.Drawing.Size(328, 279) @@ -3172,47 +3181,47 @@ Partial Class frmHauptfenster Me.gridAviso.AllowUserToAddRows = False Me.gridAviso.AllowUserToDeleteRows = False Me.gridAviso.AllowUserToResizeRows = False - DataGridViewCellStyle14.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14 + DataGridViewCellStyle32.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle32 Me.gridAviso.BackgroundColor = System.Drawing.Color.DarkGray Me.gridAviso.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable - DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle15.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle15.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle15 + DataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle33.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle33.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle33 Me.gridAviso.ColumnHeadersHeight = 25 Me.gridAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle16 + DataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle34.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle34.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle34.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle34.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle34.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle34 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 - DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 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.[False] - Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle17 + DataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle35.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle35.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle35.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle35.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle35.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle35 Me.gridAviso.RowHeadersVisible = False Me.gridAviso.RowHeadersWidth = 62 Me.gridAviso.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle18 + DataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle36 Me.gridAviso.RowTemplate.ReadOnly = True Me.gridAviso.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] Me.gridAviso.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect @@ -4063,11 +4072,24 @@ Partial Class frmHauptfenster Me.Panel7.Size = New System.Drawing.Size(252, 51) Me.Panel7.TabIndex = 4 ' - 'KLIPPHAUSENToolStripMenuItem + 'ToolStripMenuItem3 ' - Me.KLIPPHAUSENToolStripMenuItem.Name = "KLIPPHAUSENToolStripMenuItem" - Me.KLIPPHAUSENToolStripMenuItem.Size = New System.Drawing.Size(180, 22) - Me.KLIPPHAUSENToolStripMenuItem.Text = "KLIPPHAUSEN" + Me.ToolStripMenuItem3.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem23, Me.ToolStripMenuItem25}) + Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3" + Me.ToolStripMenuItem3.Size = New System.Drawing.Size(285, 30) + Me.ToolStripMenuItem3.Text = "KLIPPHAUSEN" + ' + 'ToolStripMenuItem23 + ' + Me.ToolStripMenuItem23.Name = "ToolStripMenuItem23" + Me.ToolStripMenuItem23.Size = New System.Drawing.Size(243, 22) + Me.ToolStripMenuItem23.Text = "Annahmeblatt EXPORT DE / TR" + ' + 'ToolStripMenuItem25 + ' + Me.ToolStripMenuItem25.Name = "ToolStripMenuItem25" + Me.ToolStripMenuItem25.Size = New System.Drawing.Size(243, 22) + Me.ToolStripMenuItem25.Text = "Annahmeblatt EXPORT DE / SRB" ' 'frmHauptfenster ' @@ -4534,4 +4556,7 @@ Partial Class frmHauptfenster Friend WithEvents PrüfeBilderAufBase64ToolStripMenuItem As ToolStripMenuItem Friend WithEvents ReferenzwerteToolStripMenuItem As ToolStripMenuItem Friend WithEvents KLIPPHAUSENToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ToolStripMenuItem3 As ToolStripMenuItem + Friend WithEvents ToolStripMenuItem23 As ToolStripMenuItem + Friend WithEvents ToolStripMenuItem25 As ToolStripMenuItem End Class diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index bf657c8..062d54e 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -5457,4 +5457,14 @@ ELSE_ATILLA: MsgBox("Keine Berechtigung!") End If End Sub + + Private Sub ToolStripMenuItem23_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem23.Click + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "Annahmeblatt_KLIPP_EXPORT_TR") + DS.OPEN_SINGLE_ORIG() + End Sub + + Private Sub ToolStripMenuItem25_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem25.Click + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "Annahmeblatt_KLIPP_EXPORT_YU") + DS.OPEN_SINGLE_ORIG() + End Sub End Class diff --git a/Aviso/frmHauptfensterNew.Designer.vb b/Aviso/frmHauptfensterNew.Designer.vb index 682ef15..9000a7d 100644 --- a/Aviso/frmHauptfensterNew.Designer.vb +++ b/Aviso/frmHauptfensterNew.Designer.vb @@ -288,6 +288,7 @@ Partial Class frmHauptfensterNew Me.btnKasse_LG = New System.Windows.Forms.Button() Me.btnTV = New System.Windows.Forms.Button() Me.Panel9 = New System.Windows.Forms.Panel() + Me.Button4 = New System.Windows.Forms.Button() Me.btnSmall = New System.Windows.Forms.Button() Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker() @@ -323,7 +324,9 @@ Partial Class frmHauptfensterNew Me.Panel7 = New System.Windows.Forms.Panel() Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem() Me.UidAbfrageService1 = New VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.uidAbfrageService() - Me.Button4 = New System.Windows.Forms.Button() + Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripMenuItem23 = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripMenuItem25 = New System.Windows.Forms.ToolStripMenuItem() Me.conMenuAviso.SuspendLayout() Me.MenuStrip1.SuspendLayout() Me.pnlDetailsRechts.SuspendLayout() @@ -1143,7 +1146,7 @@ Partial Class frmHauptfensterNew 'ToolStripFormulare ' Me.ToolStripFormulare.BackColor = System.Drawing.Color.White - Me.ToolStripFormulare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MANAGERToolStripMenuItem, Me.ToolStripSeparator3, Me.MailvorlagenToolStripMenuItem, Me.ToolStripMenuItem2, Me.ToolStripMenuItem7, Me.ToolStripMenuItem12, Me.ToolStripMenuItem15, Me.ToolStripMenuItem18, Me.AuftragÜberwachungsdokumentToolStripMenuItem, Me.toolVUB, Me.toolVPCreditreform, Me.ToolStripSeparator9, Me.VerzollungsunterlagenToolStripMenuItem, Me.ToolStripMenuItem11, Me.ToolStripSeparator6, Me.WAIDHAUSToolStripMenuItem, Me.ToolStripSeparator13, Me.EinheitspapierToolStripMenuItem, Me.CMRToolStripMenuItem, Me.Einheitspapier0735VersandverfahrenToolStripMenuItem, Me.CarnetTIRToolStripMenuItem, Me.CarnetTIRALTToolStripMenuItem}) + Me.ToolStripFormulare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MANAGERToolStripMenuItem, Me.ToolStripSeparator3, Me.MailvorlagenToolStripMenuItem, Me.ToolStripMenuItem2, Me.ToolStripMenuItem7, Me.ToolStripMenuItem12, Me.ToolStripMenuItem15, Me.ToolStripMenuItem18, Me.AuftragÜberwachungsdokumentToolStripMenuItem, Me.toolVUB, Me.toolVPCreditreform, Me.ToolStripSeparator9, Me.VerzollungsunterlagenToolStripMenuItem, Me.ToolStripMenuItem11, Me.ToolStripSeparator6, Me.WAIDHAUSToolStripMenuItem, Me.ToolStripMenuItem3, Me.ToolStripSeparator13, Me.EinheitspapierToolStripMenuItem, Me.CMRToolStripMenuItem, Me.Einheitspapier0735VersandverfahrenToolStripMenuItem, Me.CarnetTIRToolStripMenuItem, Me.CarnetTIRALTToolStripMenuItem}) Me.ToolStripFormulare.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripFormulare.ForeColor = System.Drawing.Color.Black Me.ToolStripFormulare.ImageAlign = System.Drawing.ContentAlignment.BottomRight @@ -1157,20 +1160,20 @@ Partial Class frmHauptfensterNew Me.MANAGERToolStripMenuItem.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Bold) Me.MANAGERToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.android_note Me.MANAGERToolStripMenuItem.Name = "MANAGERToolStripMenuItem" - Me.MANAGERToolStripMenuItem.Size = New System.Drawing.Size(277, 22) + Me.MANAGERToolStripMenuItem.Size = New System.Drawing.Size(285, 30) Me.MANAGERToolStripMenuItem.Text = "Formular - Manager" ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(274, 6) + Me.ToolStripSeparator3.Size = New System.Drawing.Size(282, 6) ' 'MailvorlagenToolStripMenuItem ' Me.MailvorlagenToolStripMenuItem.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Bold) Me.MailvorlagenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.stift Me.MailvorlagenToolStripMenuItem.Name = "MailvorlagenToolStripMenuItem" - Me.MailvorlagenToolStripMenuItem.Size = New System.Drawing.Size(277, 22) + Me.MailvorlagenToolStripMenuItem.Size = New System.Drawing.Size(285, 30) Me.MailvorlagenToolStripMenuItem.Text = "Mailvorlagen" Me.MailvorlagenToolStripMenuItem.Visible = False ' @@ -1178,7 +1181,7 @@ Partial Class frmHauptfensterNew ' Me.ToolStripMenuItem2.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolStrVM_de, Me.ZollvollmachtDEFiskalToolStripMenuItem, Me.toolStrVM_at, Me.toolStrVM_at4200, Me.ZollvollmachtATEVToolStripMenuItem}) Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2" - Me.ToolStripMenuItem2.Size = New System.Drawing.Size(277, 22) + Me.ToolStripMenuItem2.Size = New System.Drawing.Size(285, 30) Me.ToolStripMenuItem2.Text = "Vollmachten" ' 'toolStrVM_de @@ -1214,38 +1217,38 @@ Partial Class frmHauptfensterNew 'ToolStripMenuItem7 ' Me.ToolStripMenuItem7.Name = "ToolStripMenuItem7" - Me.ToolStripMenuItem7.Size = New System.Drawing.Size(277, 22) + Me.ToolStripMenuItem7.Size = New System.Drawing.Size(285, 30) Me.ToolStripMenuItem7.Text = "Gestellungsgarantien" ' 'ToolStripMenuItem12 ' Me.ToolStripMenuItem12.Name = "ToolStripMenuItem12" - Me.ToolStripMenuItem12.Size = New System.Drawing.Size(277, 22) + Me.ToolStripMenuItem12.Size = New System.Drawing.Size(285, 30) Me.ToolStripMenuItem12.Text = "Importaviso" ' 'ToolStripMenuItem15 ' Me.ToolStripMenuItem15.Name = "ToolStripMenuItem15" - Me.ToolStripMenuItem15.Size = New System.Drawing.Size(277, 22) + Me.ToolStripMenuItem15.Size = New System.Drawing.Size(285, 30) Me.ToolStripMenuItem15.Text = "Dispoliste" ' 'ToolStripMenuItem18 ' Me.ToolStripMenuItem18.Name = "ToolStripMenuItem18" - Me.ToolStripMenuItem18.Size = New System.Drawing.Size(277, 22) + Me.ToolStripMenuItem18.Size = New System.Drawing.Size(285, 30) Me.ToolStripMenuItem18.Text = "Verzollungspreise" ' 'AuftragÜberwachungsdokumentToolStripMenuItem ' Me.AuftragÜberwachungsdokumentToolStripMenuItem.Name = "AuftragÜberwachungsdokumentToolStripMenuItem" - Me.AuftragÜberwachungsdokumentToolStripMenuItem.Size = New System.Drawing.Size(277, 22) + Me.AuftragÜberwachungsdokumentToolStripMenuItem.Size = New System.Drawing.Size(285, 30) Me.AuftragÜberwachungsdokumentToolStripMenuItem.Text = "Auftrag Überwachungsdokument" ' 'toolVUB ' Me.toolVUB.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VUBVERAGSpeditionAGToolStripMenuItem, Me.VeragCustomsServiceToolStripMenuItem}) Me.toolVUB.Name = "toolVUB" - Me.toolVUB.Size = New System.Drawing.Size(277, 22) + Me.toolVUB.Size = New System.Drawing.Size(285, 30) Me.toolVUB.Text = "VUB" ' 'VUBVERAGSpeditionAGToolStripMenuItem @@ -1263,37 +1266,37 @@ Partial Class frmHauptfensterNew 'toolVPCreditreform ' Me.toolVPCreditreform.Name = "toolVPCreditreform" - Me.toolVPCreditreform.Size = New System.Drawing.Size(277, 22) + Me.toolVPCreditreform.Size = New System.Drawing.Size(285, 30) Me.toolVPCreditreform.Text = "Bonitätsauskunft (Creditreform)" Me.toolVPCreditreform.Visible = False ' 'ToolStripSeparator9 ' Me.ToolStripSeparator9.Name = "ToolStripSeparator9" - Me.ToolStripSeparator9.Size = New System.Drawing.Size(274, 6) + Me.ToolStripSeparator9.Size = New System.Drawing.Size(282, 6) ' 'VerzollungsunterlagenToolStripMenuItem ' Me.VerzollungsunterlagenToolStripMenuItem.Name = "VerzollungsunterlagenToolStripMenuItem" - Me.VerzollungsunterlagenToolStripMenuItem.Size = New System.Drawing.Size(277, 22) + Me.VerzollungsunterlagenToolStripMenuItem.Size = New System.Drawing.Size(285, 30) Me.VerzollungsunterlagenToolStripMenuItem.Text = "Verzollungsunterlagen" ' 'ToolStripMenuItem11 ' Me.ToolStripMenuItem11.Name = "ToolStripMenuItem11" - Me.ToolStripMenuItem11.Size = New System.Drawing.Size(277, 22) + Me.ToolStripMenuItem11.Size = New System.Drawing.Size(285, 30) Me.ToolStripMenuItem11.Text = "Verzollungsunterlagen BAR" ' 'ToolStripSeparator6 ' Me.ToolStripSeparator6.Name = "ToolStripSeparator6" - Me.ToolStripSeparator6.Size = New System.Drawing.Size(274, 6) + Me.ToolStripSeparator6.Size = New System.Drawing.Size(282, 6) ' 'WAIDHAUSToolStripMenuItem ' Me.WAIDHAUSToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem8, Me.ToolStripMenuItem9, Me.AnnahmeblattIMPORTToolStripMenuItem, Me.AnnahmeblattEXPORTToolStripMenuItem, Me.ChecklisteVerwahrlagerToolStripMenuItem}) Me.WAIDHAUSToolStripMenuItem.Name = "WAIDHAUSToolStripMenuItem" - Me.WAIDHAUSToolStripMenuItem.Size = New System.Drawing.Size(277, 22) + Me.WAIDHAUSToolStripMenuItem.Size = New System.Drawing.Size(285, 30) Me.WAIDHAUSToolStripMenuItem.Text = "WAIDHAUS" ' 'ToolStripMenuItem8 @@ -1329,36 +1332,36 @@ Partial Class frmHauptfensterNew 'ToolStripSeparator13 ' Me.ToolStripSeparator13.Name = "ToolStripSeparator13" - Me.ToolStripSeparator13.Size = New System.Drawing.Size(274, 6) + Me.ToolStripSeparator13.Size = New System.Drawing.Size(282, 6) ' 'EinheitspapierToolStripMenuItem ' Me.EinheitspapierToolStripMenuItem.Name = "EinheitspapierToolStripMenuItem" - Me.EinheitspapierToolStripMenuItem.Size = New System.Drawing.Size(277, 22) + Me.EinheitspapierToolStripMenuItem.Size = New System.Drawing.Size(285, 30) Me.EinheitspapierToolStripMenuItem.Text = "Einheitspapier 0777 (Vereinfachte ZA)" ' 'CMRToolStripMenuItem ' Me.CMRToolStripMenuItem.Name = "CMRToolStripMenuItem" - Me.CMRToolStripMenuItem.Size = New System.Drawing.Size(277, 22) + Me.CMRToolStripMenuItem.Size = New System.Drawing.Size(285, 30) Me.CMRToolStripMenuItem.Text = "CMR" ' 'Einheitspapier0735VersandverfahrenToolStripMenuItem ' Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Name = "Einheitspapier0735VersandverfahrenToolStripMenuItem" - Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Size = New System.Drawing.Size(277, 22) + Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Size = New System.Drawing.Size(285, 30) Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Text = "Einheitspapier 0735 (Versandverfahren)" ' 'CarnetTIRToolStripMenuItem ' Me.CarnetTIRToolStripMenuItem.Name = "CarnetTIRToolStripMenuItem" - Me.CarnetTIRToolStripMenuItem.Size = New System.Drawing.Size(277, 22) + Me.CarnetTIRToolStripMenuItem.Size = New System.Drawing.Size(285, 30) Me.CarnetTIRToolStripMenuItem.Text = "Carnet TIR" ' 'CarnetTIRALTToolStripMenuItem ' Me.CarnetTIRALTToolStripMenuItem.Name = "CarnetTIRALTToolStripMenuItem" - Me.CarnetTIRALTToolStripMenuItem.Size = New System.Drawing.Size(277, 22) + Me.CarnetTIRALTToolStripMenuItem.Size = New System.Drawing.Size(285, 30) Me.CarnetTIRALTToolStripMenuItem.Text = "Carnet TIR (ALT)" ' 'mnuFragezeichen @@ -2558,6 +2561,25 @@ Partial Class frmHauptfensterNew Me.Panel9.Size = New System.Drawing.Size(156, 157) Me.Panel9.TabIndex = 88 ' + 'Button4 + ' + Me.Button4.BackColor = System.Drawing.Color.FromArgb(CType(CType(253, Byte), Integer), CType(CType(253, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.Button4.Cursor = System.Windows.Forms.Cursors.Default + Me.Button4.FlatAppearance.BorderSize = 3 + Me.Button4.Font = New System.Drawing.Font("Segoe UI", 10.0!) + Me.Button4.ForeColor = System.Drawing.Color.Black + Me.Button4.Image = Global.AVISO.My.Resources.Resources.ico_atez_tariffAI + Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button4.Location = New System.Drawing.Point(11, 84) + Me.Button4.Margin = New System.Windows.Forms.Padding(0) + Me.Button4.Name = "Button4" + Me.Button4.Padding = New System.Windows.Forms.Padding(10, 0, 10, 0) + Me.Button4.Size = New System.Drawing.Size(135, 52) + Me.Button4.TabIndex = 8 + Me.Button4.Text = "Tariff AI" + Me.Button4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button4.UseVisualStyleBackColor = False + ' 'btnSmall ' Me.btnSmall.BackColor = System.Drawing.Color.White @@ -2853,24 +2875,24 @@ Partial Class frmHauptfensterNew Me.UidAbfrageService1.Url = "https://finanzonline.bmf.gv.at/fon/ws/uidAbfrage/" Me.UidAbfrageService1.UseDefaultCredentials = False ' - 'Button4 + 'ToolStripMenuItem3 ' - Me.Button4.BackColor = System.Drawing.Color.FromArgb(CType(CType(253, Byte), Integer), CType(CType(253, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.Button4.Cursor = System.Windows.Forms.Cursors.Default - Me.Button4.FlatAppearance.BorderSize = 3 - Me.Button4.Font = New System.Drawing.Font("Segoe UI", 10.0!) - Me.Button4.ForeColor = System.Drawing.Color.Black - Me.Button4.Image = Global.AVISO.My.Resources.Resources.ico_atez_tariffAI - Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button4.Location = New System.Drawing.Point(11, 84) - Me.Button4.Margin = New System.Windows.Forms.Padding(0) - Me.Button4.Name = "Button4" - Me.Button4.Padding = New System.Windows.Forms.Padding(10, 0, 10, 0) - Me.Button4.Size = New System.Drawing.Size(135, 52) - Me.Button4.TabIndex = 8 - Me.Button4.Text = "Tariff AI" - Me.Button4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button4.UseVisualStyleBackColor = False + Me.ToolStripMenuItem3.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem23, Me.ToolStripMenuItem25}) + Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3" + Me.ToolStripMenuItem3.Size = New System.Drawing.Size(285, 30) + Me.ToolStripMenuItem3.Text = "KLIPPHAUSEN" + ' + 'ToolStripMenuItem23 + ' + Me.ToolStripMenuItem23.Name = "ToolStripMenuItem23" + Me.ToolStripMenuItem23.Size = New System.Drawing.Size(243, 22) + Me.ToolStripMenuItem23.Text = "Annahmeblatt EXPORT DE / TR" + ' + 'ToolStripMenuItem25 + ' + Me.ToolStripMenuItem25.Name = "ToolStripMenuItem25" + Me.ToolStripMenuItem25.Size = New System.Drawing.Size(243, 22) + Me.ToolStripMenuItem25.Text = "Annahmeblatt EXPORT DE / SRB" ' 'frmHauptfensterNew ' @@ -3236,4 +3258,7 @@ Partial Class frmHauptfensterNew Friend WithEvents btnDEFAULT_UnSelected As Button Friend WithEvents UsrCntlMessenger_ListNewChats1 As VERAG_PROG_ALLGEMEIN.usrCntlMessenger_ListNewChats Friend WithEvents Button4 As Button + Friend WithEvents ToolStripMenuItem3 As ToolStripMenuItem + Friend WithEvents ToolStripMenuItem23 As ToolStripMenuItem + Friend WithEvents ToolStripMenuItem25 As ToolStripMenuItem End Class diff --git a/Aviso/frmHauptfensterNew.vb b/Aviso/frmHauptfensterNew.vb index 582e80b..847f890 100644 --- a/Aviso/frmHauptfensterNew.vb +++ b/Aviso/frmHauptfensterNew.vb @@ -3959,4 +3959,15 @@ ELSE_ATILLA: Private Sub Button4_Click_2(sender As Object, e As EventArgs) Handles Button4.Click End Sub + + Private Sub ToolStripMenuItem23_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem23.Click + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "Annahmeblatt_KLIPP_EXPORT_TR") + DS.OPEN_SINGLE_ORIG() + End Sub + + + Private Sub ToolStripMenuItem25_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem25.Click + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "Annahmeblatt_KLIPP_EXPORT_YU") + DS.OPEN_SINGLE_ORIG() + End Sub End Class diff --git a/Aviso/frmLaufzettel.vb b/Aviso/frmLaufzettel.vb index 0bdd3ae..e9fc87d 100644 --- a/Aviso/frmLaufzettel.vb +++ b/Aviso/frmLaufzettel.vb @@ -425,7 +425,7 @@ Public Class frmLaufzettel Mail.To = "poststelle.za-dettelbach@zoll.bund.de" tX = New VERAG_PROG_ALLGEMEIN.cTextkonserve("LAUFZETTEL_DIGITAL", "LAUFZETTEL_DE_DIGITAL_DTB", "DE", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) Case "WAI" - Mail.To = "" + Mail.To = "zE-zV-VERAG.hza-regensburg@zoll.bund.de" tX = New VERAG_PROG_ALLGEMEIN.cTextkonserve("LAUFZETTEL_DIGITAL", "LAUFZETTEL_DE_DIGITAL_WAI", "DE", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) Case "SBG" Mail.To = "" diff --git a/Aviso/frmSendungsDokumentanforderung.vb b/Aviso/frmSendungsDokumentanforderung.vb index 1ed4c40..97dbee4 100644 --- a/Aviso/frmSendungsDokumentanforderung.vb +++ b/Aviso/frmSendungsDokumentanforderung.vb @@ -85,7 +85,7 @@ Public Class frmSendungsDokumentanforderung End If Next End If - + If cmbCustomerUploadEmailTemplate.Items.Count > 0 Then cmbCustomerUploadEmailTemplate.SelectedIndex = 0 End If @@ -107,7 +107,7 @@ Public Class frmSendungsDokumentanforderung For Each row As DataRow In _emailTemplates.Rows Dim bezeichnung = If(IsDBNull(row("txt_bezeichnung")), "", CStr(row("txt_bezeichnung"))).Trim() Dim sprache = If(IsDBNull(row("txt_sprache")), "", CStr(row("txt_sprache"))).Trim().ToLowerInvariant() - + If String.Equals(bezeichnung, selectedTemplate, StringComparison.OrdinalIgnoreCase) Then ' Wenn wir die genaue Sprache finden, nimm diese If String.Equals(sprache, selectedLang, StringComparison.OrdinalIgnoreCase) Then diff --git a/Aviso/packages.config b/Aviso/packages.config index 5b035fc..2477d1b 100644 --- a/Aviso/packages.config +++ b/Aviso/packages.config @@ -1,5 +1,6 @@  + @@ -15,14 +16,24 @@ - + + + + - + + + + + + + + @@ -33,12 +44,15 @@ + + + - + \ No newline at end of file