diff --git a/AVISOUPDATER/AVISOUPDATER_Version.txt b/AVISOUPDATER/AVISOUPDATER_Version.txt index 5049538..7104585 100644 --- a/AVISOUPDATER/AVISOUPDATER_Version.txt +++ b/AVISOUPDATER/AVISOUPDATER_Version.txt @@ -1 +1 @@ -6.0 \ No newline at end of file +7.0 \ No newline at end of file diff --git a/AVISOUPDATER/UPDATERfrm.vb b/AVISOUPDATER/UPDATERfrm.vb index 4d45332..87b7c63 100644 --- a/AVISOUPDATER/UPDATERfrm.vb +++ b/AVISOUPDATER/UPDATERfrm.vb @@ -18,7 +18,8 @@ Public Class UPDATERfrm Dim F As String = "F:\Programme\AVISO\" ' WDH TERM - Dim F_PROD As String = "\\192.168.0.91\f\Programme\AVISO\" ' VERAG + ' Dim F_PROD As String = "\\192.168.0.91\f\Programme\AVISO\" ' VERAG + Dim F_PROD As String = "\\share01.verag.ost.dmn\Programme\AVISO\" ' VERAG ' Dim F As String = "\\192.168.0.90\f\Programme\AVISO\" 'DEVELOPER Dim F_ATILLA As String = "\\172.16.0.99\Daten\Programme\AVISO\" ' ATILLA Public Sub Main() diff --git a/Aviso/Anhänge/frmSendungAnhangImport.vb b/Aviso/Anhänge/frmSendungAnhangImport.vb index f4e91ac..bd32de3 100644 --- a/Aviso/Anhänge/frmSendungAnhangImport.vb +++ b/Aviso/Anhänge/frmSendungAnhangImport.vb @@ -619,8 +619,7 @@ Public Class frmSendungAnhangImport Return True End Function - - Public Function ExtractPdfPages_NEW(ByVal SourceFile As String, ByVal TargetFile As String, pagesToExtract As List(Of Integer)) As Boolean + Public Function ExtractPdfPages_NEW(ByVal SourceFile As String, ByVal TargetFile As String, pagesToExtract As List(Of Integer)) As Boolean 'ITEXTSHARP Try Dim impPage As iTextSharp.text.pdf.PdfImportedPage = Nothing Dim Reader As New iTextSharp.text.pdf.PdfReader(SourceFile) @@ -651,6 +650,103 @@ Public Class frmSendungAnhangImport End Try Return False End Function + + 'ITEXT 7 ::::: + 'Public Function ExtractPdfPages_NEW(ByVal SourceFile As String, ByVal TargetFile As String, pagesToExtract As List(Of Integer)) As Boolean + ' Try + + ' If Not TargetFile.ToLower.EndsWith(".pdf") Then TargetFile = TargetFile & ".pdf" + + ' Dim Reader = New iText.Kernel.Pdf.PdfReader(SourceFile) + ' Dim srcDoc As New iText.Kernel.Pdf.PdfDocument(Reader) + ' Dim srcDocsp As New iText.Kernel.Utils.PdfSplitter(srcDoc) + + ' ' Dim splitRanges As IList(Of iText.Kernel.Utils.PageRange) = New List(Of iText.Kernel.Utils.PageRange)() + ' Dim splitRange As New iText.Kernel.Utils.PageRange + + ' For Each p In pagesToExtract + ' ' pageRanges.Add(p) + ' splitRange.AddSinglePage(p) + ' Next + ' ' splitRange.Add(nextRange) + + ' Dim PDFTarget As iText.Kernel.Pdf.PdfDocument = srcDocsp.ExtractPageRange(splitRange) + + ' Dim PdfWriter = New iText.Kernel.Pdf.PdfWriter(TargetFile) + ' Dim PdfWriter2 As iText.Kernel.Pdf.PdfWriter = PDFTarget.GetWriter() + + ' 'Dim PdfCopyProvider As New iTextSharp.text.pdf.PdfCopy(srcDoc, New System.IO.FileStream(TargetFile, System.IO.FileMode.Create)) + + + ' PdfWriter.Close() + ' srcDoc.Close() + ' Reader.Close() + ' PDFTarget.Close() + + ' ''PdfDocument pdf = New iText.Kernel.Pdf.PdfDocument(writer) + + + ' ''Dim impPage As iTextSharp.text.pdf.PdfImportedPage = Nothing + ' ''Dim Reader As New iTextSharp.text.pdf.PdfReader(SourceFile) + ' 'Dim impPage As iText.Kernel.Pdf.PdfPage = Nothing + ' 'Dim Reader = New iText.Kernel.Pdf.PdfReader(SourceFile) + ' 'If Not TargetFile.ToLower.EndsWith(".pdf") Then TargetFile = TargetFile & ".pdf" + ' ''Dim srcDoc As New iTextSharp.text.Document() + ' 'Dim srcDoc As New iText.Kernel.Pdf.PdfDocument(Reader) + ' 'Dim srcDocsp As New iText.Kernel.Utils.PdfSplitter(Reader) + ' 'srcDocsp.ExtractPageRanges() + + ' 'Dim PdfCopyProvider As New iTextSharp.text.pdf.PdfCopy(srcDoc, New System.IO.FileStream(TargetFile, System.IO.FileMode.Create)) + ' 'PdfCopyProvider.SetFullCompression() + ' 'srcDoc.Open() + ' 'For Each p In pagesToExtract + ' ' If p > Reader.NumberOfPages Then + ' ' MsgBox("Seitenanzahl überschritten!") + ' ' srcDoc.Close() : Reader.Close() + ' ' Return False + ' ' End If + ' ' impPage = PdfCopyProvider.GetImportedPage(Reader, p) + ' ' ' ----- Ermitteln der Seitenauflösung und setzen für die neue Seite + ' ' PdfCopyProvider.SetPageSize(New iText.Kernel.Geom.Rectangle(0.0F, 0.0F, impPage.Width, impPage.Height, Reader.GetPageRotation(p))) + + ' ' ' ----- PDF Seite in das neue Dokument einfügen + ' ' PdfCopyProvider.AddPage(impPage) + + ' 'Next + ' '' ----- neues PDF Dokument und den Reader schließen + ' 'srcDoc.Close() + ' 'Reader.Close() + ' Return True + ' Catch ex As Exception + ' MsgBox(ex.Message & ex.StackTrace) + ' End Try + ' Return False + 'End Function + + 'Public Sub ExtractPages(ByVal sourcePdfPath As String, ByVal outputPdfPath As String, ByVal startPage As Integer, ByVal endPage As Integer) 'ITEXT OLD + ' Dim reader As iText.Kernel.Pdf.PdfReader = Nothing + ' Dim sourceDocument As iText.Kernel.Pdf.PdfDocument = Nothing + ' Dim pdfCopyProvider As iText.Kernel.Pdf.PdfCopy = Nothing + ' Dim importedPage As iText.Kernel.Pdf.PdfImportedPage = Nothing + + ' Try + ' reader = New iText.Kernel.Pdf.PdfReader(sourcePdfPath) + ' sourceDocument = New iText.Kernel.Pdf.PdfDocument(reader.GetPageSizeWithRotation(startPage)) + ' pdfCopyProvider = New iText.Kernel.Pdf.PdfCopy(sourceDocument, New System.IO.FileStream(outputPdfPath, System.IO.FileMode.Create)) + ' sourceDocument.Open() + + ' For i As Integer = startPage To endPage + ' importedPage = pdfCopyProvider.GetImportedPage(reader, i) + ' pdfCopyProvider.AddPage(importedPage) + ' Next + + ' sourceDocument.Close() + ' reader.Close() + ' Catch ex As Exception + ' Throw ex + ' End Try + 'End Sub + 'Public Function ExtractPdfPages(ByVal SourceFile As String, ByVal TargetFile As String, ByVal IntStr As Integer, ByVal IntEnd As Integer) ' Try ' Dim impPage As iTextSharp.text.pdf.PdfImportedPage = Nothing @@ -677,6 +773,101 @@ Public Class frmSendungAnhangImport 'End Function + 'ITEXT 7:: + 'Public Function removePagesFromPdf_NEW(ByVal sourceFile As String, ByVal destinationFile As String, pagesToDelete As List(Of Integer), ByRef PagesLeft As Integer, delSource As Boolean) As Boolean + + ' Try + + + + ' ' Dim pdfReader As iText.Kernel.Pdf.PdfReader = New iText.Kernel.Pdf.PdfReader(sourceFile) + ' ' Dim pdfwriter As iText.Kernel.Pdf.PdfWriter = New iText.Kernel.Pdf.PdfWriter(destinationFile) + ' 'Dim docOringal = New iText.Kernel.Pdf.PdfDocument(pdfReader, pdfwriter) + + ' Dim NewPagesReader = New iText.Kernel.Pdf.PdfReader(destinationFile) + ' Dim docNewPages = New iText.Kernel.Pdf.PdfDocument(NewPagesReader) + + ' Dim OriginalDocReader = New iText.Kernel.Pdf.PdfReader(sourceFile) + ' 'Dim NewPDFWriter As New iText.Kernel.Pdf.PdfWriter(sourceFile) + ' Dim docOringal = New iText.Kernel.Pdf.PdfDocument(OriginalDocReader) ', NewPDFWriter) + ' 'docOringal.GetNumberOfPages + + + + + ' PagesLeft = 0 + ' ' Dim r As iTextSharp.text.pdf.PdfReader = New iTextSharp.text.pdf.PdfReader(sourceFile) + ' Dim pagesToKeep As New List(Of Integer) + ' For p = 1 To docOringal.GetNumberOfPages + ' Dim del = False + ' For Each i In pagesToDelete + ' If p = i Then + ' del = True : Exit For + ' End If + ' Next + ' If Not del Then + ' pagesToKeep.Add(p) + ' End If + ' Next + + + + + ' For Each p In pagesToKeep + ' docNewPages.CopyPagesTo(p, p, docOringal) + ' Next + + ' docOringal.Close() + + + ' 'If pagesToKeep.Count > 0 Then + ' ' PagesLeft = r.NumberOfPages - pagesToKeep.Count + ' ' If ExtractPdfPages_NEW(sourceFile, destinationFile, pagesToKeep) Then + ' ' If delSource Then tryDelete(sourceFile) + ' ' End If + + ' ' If delSource Then tryDelete(sourceFile) + ' 'End If + + + + ' 'If Not TargetFile.ToLower.EndsWith(".pdf") Then TargetFile = TargetFile & ".pdf" + + ' 'Dim Reader = New iText.Kernel.Pdf.PdfReader(sourceFile) + ' 'Dim srcDoc As New iText.Kernel.Pdf.PdfDocument(Reader) + ' 'Dim srcDocsp As New iText.Kernel.Utils.PdfSplitter(srcDoc) + + ' 'Dim splitRanges As IList(Of iText.Kernel.Utils.PageRange) = New List(Of iText.Kernel.Utils.PageRange)() + + ' 'For Each p In pagesToExtract + ' ' ' pageRanges.Add(p) + ' ' Dim nextRange As New iText.Kernel.Utils.PageRange '= GetNextRange(currentPage, numOfPages, Size) + ' ' nextRange.AddSinglePage(p) + ' ' splitRanges.Add(nextRange) + ' 'Next + + ' 'Dim PDFTarget As iText.Kernel.Pdf.PdfDocument = srcDocsp.ExtractPageRange(splitRanges) + + ' 'Dim PdfWriter = New iText.Kernel.Pdf.PdfWriter(TargetFile) + ' 'Dim PdfWriter2 As iText.Kernel.Pdf.PdfWriter = PDFTarget.GetWriter() + + ' ''Dim PdfCopyProvider As New iTextSharp.text.pdf.PdfCopy(srcDoc, New System.IO.FileStream(TargetFile, System.IO.FileMode.Create)) + + + ' 'PdfWriter.Close() + ' 'srcDoc.Close() + ' 'Reader.Close() + ' 'PDFTarget.Close() + + + ' Return True + ' Catch ex As Exception + ' MsgBox(ex.Message & ex.StackTrace) + ' End Try + ' Return False + 'End Function + + Public Function removePagesFromPdf_NEW(ByVal sourceFile As String, ByVal destinationFile As String, pagesToDelete As List(Of Integer), ByRef PagesLeft As Integer, delSource As Boolean) As Boolean Try @@ -724,7 +915,7 @@ Public Class frmSendungAnhangImport Return True Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) + MsgBox(ex.Message & ex.StackTrace) End Try Return False End Function diff --git a/Aviso/App.config b/Aviso/App.config index 03ccbd6..f380249 100644 --- a/Aviso/App.config +++ b/Aviso/App.config @@ -59,6 +59,10 @@ + + + + diff --git a/Aviso/Auswertung/usrctStatistik.Designer.vb b/Aviso/Auswertung/usrctStatistik.Designer.vb index 67b0e51..75e82a0 100644 --- a/Aviso/Auswertung/usrctStatistik.Designer.vb +++ b/Aviso/Auswertung/usrctStatistik.Designer.vb @@ -346,7 +346,7 @@ Partial Class usrctStatistik ' Me.cboFirma.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.cboFirma.FormattingEnabled = True - Me.cboFirma.Items.AddRange(New Object() {"VERAG", "ATILLA", "IMEX", "UNISPED"}) + Me.cboFirma.Items.AddRange(New Object() {"VERAG", "ATILLA", "IMEX", "UNISPED", "FRONTOFFICE"}) Me.cboFirma.Location = New System.Drawing.Point(236, 2) Me.cboFirma.Name = "cboFirma" Me.cboFirma.Size = New System.Drawing.Size(69, 21) diff --git a/Aviso/Auswertung/usrctStatistik.vb b/Aviso/Auswertung/usrctStatistik.vb index df200dc..e29e6c3 100644 --- a/Aviso/Auswertung/usrctStatistik.vb +++ b/Aviso/Auswertung/usrctStatistik.vb @@ -124,7 +124,14 @@ Public Class usrctStatistik Dim datTmp As Date = datVon While datTmp <= datBis If datTmp.DayOfWeek = cboTag.SelectedIndex Then - gesLKWs += SQLstat.getAnzahlLkwAnkunft(art, datTmp, i, cboFirma.Text) + Dim Firma = "" + Dim Cluster="" + If cboFirma.Text = "FRONTOFFICE" Then + Cluster = cboFirma.Text + Else + Firma = cboFirma.Text + End If + gesLKWs += SQLstat.getAnzahlLkwAnkunft(art, datTmp, i, Firma, Cluster) cnt += 1 End If datTmp = datTmp.AddDays(1) diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index 89d9fce..2eca8a9 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -103,12 +103,18 @@ - - ..\packages\Portable.BouncyCastle.1.8.2\lib\net40\BouncyCastle.Crypto.dll + + ..\packages\Portable.BouncyCastle.1.8.5\lib\net40\BouncyCastle.Crypto.dll ..\packages\esendex-dotnet-sdk.3.8.0\lib\net35\com.esendex.sdk.dll + + ..\packages\Common.Logging.3.4.1\lib\net40\Common.Logging.dll + + + ..\packages\Common.Logging.Core.3.4.1\lib\net40\Common.Logging.Core.dll + False C:\Program Files (x86)\Open XML SDK\V2.5\lib\DocumentFormat.OpenXml.dll @@ -137,13 +143,42 @@ ..\packages\GrapeCity.Documents.Pdf.2.2.0.315\lib\net461\GrapeCity.Documents.Pdf.dll + + ..\packages\itext7.7.1.11\lib\net40\itext.barcodes.dll + + + ..\packages\itext7.7.1.11\lib\net40\itext.forms.dll + + + ..\packages\itext7.7.1.11\lib\net40\itext.io.dll + + + ..\packages\itext7.7.1.11\lib\net40\itext.kernel.dll + + + ..\packages\itext7.7.1.11\lib\net40\itext.layout.dll + + + ..\packages\itext7.7.1.11\lib\net40\itext.pdfa.dll + + + ..\packages\itext7.7.1.11\lib\net40\itext.sign.dll + + + ..\packages\itext7.7.1.11\lib\net40\itext.styledxmlparser.dll + + + ..\packages\itext7.7.1.11\lib\net40\itext.svg.dll + False ..\..\..\dll\itextsharp.dll - + + False ..\..\..\dll\itextsharp.pdfa.dll + True @@ -1096,6 +1131,7 @@ + Always diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index ccc2edf..f165e3b 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/My Project/Resources.Designer.vb b/Aviso/My Project/Resources.Designer.vb index 30d5220..6f6860b 100644 --- a/Aviso/My Project/Resources.Designer.vb +++ b/Aviso/My Project/Resources.Designer.vb @@ -179,6 +179,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property arrow_down_orange() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("arrow_down_orange", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -1049,15 +1059,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Sucht eine lokalisierte Zeichenfolge, die ähnelt. - ''' - Friend ReadOnly Property sdfsdfsdfsdf3sdfsdfsdf() As String - Get - Return ResourceManager.GetString("sdfsdfsdfsdf3sdfsdfsdf", resourceCulture) - End Get - End Property - ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -1368,7 +1369,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 3.5.0.2 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die 3.5.1.9 ähnelt. ''' Friend ReadOnly Property Version() As String Get diff --git a/Aviso/My Project/Resources.resx b/Aviso/My Project/Resources.resx index 1db0f27..8a9bffd 100644 --- a/Aviso/My Project/Resources.resx +++ b/Aviso/My Project/Resources.resx @@ -118,401 +118,266 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\wheel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\personInaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\vorauszahlung.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\lorry.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\spedbuch1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Versionsinfo.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - - ..\Resources\QS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Telefonliste.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\IMEX.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\gear2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\del_gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\android-note1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\pdf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\els.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\mitarbeiter_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\printer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\tarife.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\personCheck_blue_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\LEX.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\disconnect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ambar_simple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\fakturiertAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\zoll_mm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\weiterleiten.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\isd.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\plus1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\nellenquack.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\digitalerAkt.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\android-add-contact.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\person_add.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\sanduhr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\tranparent30Perc.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\del2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\cartable_ouvert.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\android-clock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Atilla.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\pdf11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + aviso2015 + + + ..\Resources\vermerk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\parkplatz.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\rhenus.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\statusBtn_vorbereitet_InAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\android-clock_s.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\arrow-left-a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\urgent.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Aviso.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\kita.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\FrontOfficeSUB.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\handy1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\docAllgemein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\zoll.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\pdfprint.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\auftrag3.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\NKD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\searchGG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Unisped_logo.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\spedbuch.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\tan.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Telefonliste_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\isd.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\auftrag.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\IMEX-LOGO_simple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\statistik.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\zoll1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\noAviso_s1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\uid.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\abgeklaertAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\beleg.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\arrow-right-a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\vorauszahlung1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\word.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\android-note.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\zeus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\truck_black.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\searchGG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\igl.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\NDK.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\tranparent30Perc.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\personCheck_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\tts.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\email.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\email_big1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\android-clock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\parkplatz.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\personInaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\beleg1.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\kasse1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ImageIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\printer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\documents.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\android-clock_s.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\android-add-contact.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\lorry.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\person.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\3s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\rhenus.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Atilla.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\scanner.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\pdfprint1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\handy1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\image_443x282.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\vermerk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\bundesanzeiger.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\android-friends.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\cartable_ouvert.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Excel_2013_logo-155x110.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\plus1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\passport.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\speditionsbuchInaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\sanduhr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\abgeklaertInaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\kasse_sw_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\urgent.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\SBG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Aviso.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\docAllgemein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\warning2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\akt_ATILLA.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - 3.5.0.2 - - - ..\Resources\Verag-AG-Logopng.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\1600.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\pdf11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\zoll.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\LateAviso_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\kasse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\pdfprint.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\handy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\zoll_mmm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\auftrag3.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\pdf1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - aviso2015 - - - ..\Resources\person_add.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\LEX.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\android-add-contact.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\soenmez.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\nellenquack.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\SUB.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\stift.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\kita.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\belegEUR.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\noAviso_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\warning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\akt_ATILLA.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\spedbuch1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\uid.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\gear2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\vermerkBtn.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\disconnect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\handy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - 6.0 - - - ..\Resources\fremdSped.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\warning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\stift1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\NKD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\vorauszahlung1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\word.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\zoll_mm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\belegEUR1.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\hp-versuchskaninchen.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\pdf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\MUSTER.nlc;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\evolog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\belegEUR.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\tarife.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\speditionsbuchAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\vorauszahlung3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\del2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\WAI.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ok.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\stift.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\arrow-left-a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\vorauszahlung2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Versionsinfo.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - - - ..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ambar_simple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\dakosy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\SUB.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\dakosy_dy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\FrontOfficeSUB.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\stift.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\statusBtn_vorbereitet_Aktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\beleg1.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\statusBtn_vorbereitet_InAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\personCheck_gray_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\statusBtn_vorgeschrieben_Aktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\pdfprint1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stift.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\personCheck_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\QS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\vorauszahlung3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\arrow-right-a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\IMEX-LOGO_simple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\person.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\statusBtn_vorgeschrieben_InAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\digitalerAkt.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\weiterleiten_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\fremdSped.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\belegEUR1.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WAI.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\MUSTER.nlc;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\SBG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\android-note1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\digitalerAkt_small.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -520,52 +385,187 @@ ..\Resources\personCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\personCheck_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\personCheck_blue_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\personCheck_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\personCheck_gray_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\aviso_messenger.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\avisoNewMsg.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\vorauszahlung2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Telefonliste.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\dakosy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Telefonliste_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\android-note.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Logo_blue_globe_Horizontal.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\android-friends.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\weiterleiten.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\speditionsbuchInaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\weiterleiten_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\tan.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\fakturiertAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\auftrag.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\fakturiertInaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\zoll_mmm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\android-add-contact.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\1600.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\wheel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\speditionsbuchAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\warning2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\mitarbeiter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\mitarbeiter_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\fakturiertInaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - + + ..\Resources\vorauszahlung.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\bundesanzeiger.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ok.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\zoll1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\word.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\abgeklaertAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Logo_blue_globe_Horizontal.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\email.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Excel_2013_logo-155x110.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\passport.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + 6.0 + + + ..\Resources\statistik.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\kasse1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ImageIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\3s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\avisoNewMsg.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\zeus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\documents.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\igl.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\kasse_sw_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\LateAviso_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\evolog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\pdf1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\hp-versuchskaninchen.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\noAviso_s1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\del_gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\NDK.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\email_big1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + 3.5.1.9 + + + ..\Resources\statusBtn_vorgeschrieben_Aktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\soenmez.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\beleg.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\statusBtn_vorbereitet_Aktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\abgeklaertInaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\image_443x282.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\kasse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\truck_black.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\scanner.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\word.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Verag-AG-Logopng.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\IMEX.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\arrow_down_orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/Aviso/Resources/arrow_down_orange.png b/Aviso/Resources/arrow_down_orange.png new file mode 100644 index 0000000..67f4812 Binary files /dev/null and b/Aviso/Resources/arrow_down_orange.png differ diff --git a/Aviso/cProgramFunctions.vb b/Aviso/cProgramFunctions.vb index 5334a39..e0a0427 100644 --- a/Aviso/cProgramFunctions.vb +++ b/Aviso/cProgramFunctions.vb @@ -6,7 +6,10 @@ Public Class cProgramFunctions Shared Function updateUpdater() As Boolean Try Dim aktVersion = My.Resources.UpdaterVersion ' Aktuelle Updater Version - Dim F = "F:\Programme\AVISO_install\" + Dim F = "F:\Programme\AVISO_INSTALL" + If Not IO.Directory.Exists(F) Then + F = "\\share01\Programme\AVISO_INSTALL" + End If Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Case "IMEX" diff --git a/Aviso/eAviso/frm_eAVISO.vb b/Aviso/eAviso/frm_eAVISO.vb index 38f0650..d7a7f83 100644 --- a/Aviso/eAviso/frm_eAVISO.vb +++ b/Aviso/eAviso/frm_eAVISO.vb @@ -5,7 +5,7 @@ Sub intiDGV_Vorpapier() With MyDatagridview1 - .DataSource = SQL.loadDgvBySql("SELECT [ncts_Id],[ncts_Partnersystem],[ncts_dyaArt],[ncts_MRN],[ncts_Erstellung],[ncts_Befoerderungsmittel_KennzeichenAbgang] Kennzeichen,[ncts_SumA_Befoerderer_Name]Befoerderer FROM [tblNCTS_TR]", "FMZOLL") + .DataSource = SQL.loadDgvBySql("SELECT [ncts_Id],[ncts_Partnersystem],[ncts_dyaArt],[ncts_MRN],[ncts_Erstellung],[ncts_Befoerderungsmittel_KennzeichenAbgang] Kennzeichen,[ncts_SumA_Befoerderer_Name]Befoerderer FROM [tblNCTS_TR] WHERE ncts_Partnersystem='ATEZ' ", "FMZOLL") If .Columns.Count = 0 Then Exit Sub @@ -14,6 +14,7 @@ .Columns("ncts_Partnersystem").HeaderText = "Partner" .Columns("ncts_Partnersystem").Width = 60 + .Columns("ncts_Partnersystem").Visible = False .Columns("ncts_dyaArt").HeaderText = "Art" .Columns("ncts_dyaArt").Width = 30 @@ -97,7 +98,8 @@ AVISO.LKW_Nr = PREPAPER.ncts_Befoerderungsmittel_KennzeichenAbgang AVISO.LKW_Nationalitaet = PREPAPER.ncts_Befoerderungsmittel_SttaszugehoerigkeitAbgangCode - + AVISO.Auftraggeber = PREPAPER.ncts_Partnersystem '"ATEZ" + AVISO.Frächter = If(PREPAPER.ncts_SumA_Befoerderer_Name, "X") AVISO.Datum = Now AVISO.VoraussichtlichesEintreffen = Nothing @@ -111,9 +113,9 @@ AVISO.Vorbereitet = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.LeerDatum AVISO.Vorgeschrieben = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.LeerDatum AVISO.Dauer = 0 - AVISO.Auftraggeber = "X" + ' AVISO.Auftraggeber = "X" 'AVISO.Auftraggeber_KdNr As String = "" - AVISO.Frächter = "X" + 'AVISO.Frächter = "X" 'AVISO.Frächter_KdNr As String = "" AVISO.Info = "" AVISO.letzterMitarbeiter = VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter @@ -198,6 +200,17 @@ SENDUNG.LetzterMitarbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME SENDUNG.LetzterMitarbeiterId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID + For Each AD In SHIPMENT.EZA.ADDRESS + If AD.AddressCode = "CN" Then + SENDUNG.tblSnd_Absender = AD.Name1 & "; " & AD.City + SENDUNG.tblSnd_AbsenderKdNr = -1 + End If + If AD.AddressCode = "CZ" Then + SENDUNG.tblSnd_Empfaenger = AD.Name1 & "; " & AD.City + SENDUNG.tblSnd_EmpfaengerKdNr = -1 + End If + Next + SENDUNG.VORSYSTEM = SHIPMENT.shTr_Partnersystem SENDUNG.VORSYSTEM_Id = SHIPMENT.shTr_id SENDUNG.tblSnd_anzahlHandling = 0 @@ -207,6 +220,8 @@ cnt += 1 End If Next + frmHauptfenster.avisoAktualisierenAktiveIdBehalten(AVISO.AvisoID) + Me.Close() End If diff --git a/Aviso/frmEintragAviso.designer.vb b/Aviso/frmEintragAviso.designer.vb index 680eb14..0ebb2df 100644 --- a/Aviso/frmEintragAviso.designer.vb +++ b/Aviso/frmEintragAviso.designer.vb @@ -142,6 +142,7 @@ Partial Class frmEintragAviso Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.clmnPfad = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.lblErr_KdNr = New System.Windows.Forms.Label() Me.panAdmin.SuspendLayout() Me.grpAviso.SuspendLayout() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() @@ -711,6 +712,7 @@ Partial Class frmEintragAviso ' 'grpAviso ' + Me.grpAviso.Controls.Add(Me.lblErr_KdNr) Me.grpAviso.Controls.Add(Me.Button5) Me.grpAviso.Controls.Add(Me.lblErrVorraussuchtlEintreffen) Me.grpAviso.Controls.Add(Me.txtAvisiererAuftragsNr) @@ -825,6 +827,7 @@ Partial Class frmEintragAviso Me.kdAuftraggeber._displayWoelflKd = False Me.kdAuftraggeber._hideIfListEmpty = True Me.kdAuftraggeber._loadKdData = False + Me.kdAuftraggeber._UseFIRMA = "" Me.kdAuftraggeber._ValueKdAndName = True Me.kdAuftraggeber.dgvpos = "LEFT" Me.kdAuftraggeber.KdName = "" @@ -837,6 +840,7 @@ Partial Class frmEintragAviso Me.kdAuftraggeber.searchActive = True Me.kdAuftraggeber.Size = New System.Drawing.Size(343, 20) Me.kdAuftraggeber.TabIndex = 40 + Me.kdAuftraggeber.TIMER_SEARCH = True Me.kdAuftraggeber.usrcntl = Nothing Me.kdAuftraggeber.Visible = False ' @@ -851,6 +855,7 @@ Partial Class frmEintragAviso Me.kdAvisierer._displayWoelflKd = False Me.kdAvisierer._hideIfListEmpty = True Me.kdAvisierer._loadKdData = False + Me.kdAvisierer._UseFIRMA = "" Me.kdAvisierer._ValueKdAndName = True Me.kdAvisierer.dgvpos = "LEFT" Me.kdAvisierer.KdName = "" @@ -863,6 +868,7 @@ Partial Class frmEintragAviso Me.kdAvisierer.searchActive = True Me.kdAvisierer.Size = New System.Drawing.Size(343, 20) Me.kdAvisierer.TabIndex = 34 + Me.kdAvisierer.TIMER_SEARCH = True Me.kdAvisierer.usrcntl = Nothing ' 'kdFrächter @@ -876,6 +882,7 @@ Partial Class frmEintragAviso Me.kdFrächter._displayWoelflKd = False Me.kdFrächter._hideIfListEmpty = True Me.kdFrächter._loadKdData = False + Me.kdFrächter._UseFIRMA = "" Me.kdFrächter._ValueKdAndName = True Me.kdFrächter.dgvpos = "LEFT" Me.kdFrächter.KdName = "" @@ -888,6 +895,7 @@ Partial Class frmEintragAviso Me.kdFrächter.searchActive = True Me.kdFrächter.Size = New System.Drawing.Size(343, 20) Me.kdFrächter.TabIndex = 27 + Me.kdFrächter.TIMER_SEARCH = True Me.kdFrächter.usrcntl = Nothing ' 'lblZA @@ -904,6 +912,7 @@ Partial Class frmEintragAviso ' Me.txtBestimmungszollstelle._allowFreitext = False Me.txtBestimmungszollstelle._AllowSetValue = False + Me.txtBestimmungszollstelle._allowSpaceAsSplitter = False Me.txtBestimmungszollstelle._autoSizeGross = False Me.txtBestimmungszollstelle._hideIfListEmpty = True Me.txtBestimmungszollstelle._value = Nothing @@ -946,6 +955,7 @@ Partial Class frmEintragAviso ' Me.sbLkwNationalitaet._allowFreitext = False Me.sbLkwNationalitaet._AllowSetValue = False + Me.sbLkwNationalitaet._allowSpaceAsSplitter = False Me.sbLkwNationalitaet._autoSizeGross = False Me.sbLkwNationalitaet._hideIfListEmpty = True Me.sbLkwNationalitaet._value = Nothing @@ -1670,6 +1680,17 @@ Partial Class frmEintragAviso Me.clmnPfad.ReadOnly = True Me.clmnPfad.Visible = False ' + 'lblErr_KdNr + ' + Me.lblErr_KdNr.AutoSize = True + Me.lblErr_KdNr.ForeColor = System.Drawing.Color.Red + Me.lblErr_KdNr.Location = New System.Drawing.Point(130, 234) + Me.lblErr_KdNr.Name = "lblErr_KdNr" + Me.lblErr_KdNr.Size = New System.Drawing.Size(136, 13) + Me.lblErr_KdNr.TabIndex = 53 + Me.lblErr_KdNr.Text = "Kunden-Nummer eingeben!" + Me.lblErr_KdNr.Visible = False + ' 'frmEintragAviso ' Me.AcceptButton = Me.btnOK @@ -1843,4 +1864,5 @@ Partial Class frmEintragAviso Friend WithEvents datVoraussichtlichesEintreffen As DateTimePicker Friend WithEvents columnName As DataGridViewTextBoxColumn Friend WithEvents clmnPfad As DataGridViewTextBoxColumn + Friend WithEvents lblErr_KdNr As Label End Class diff --git a/Aviso/frmEintragAviso.vb b/Aviso/frmEintragAviso.vb index 5dd1b9d..f2af1d3 100644 --- a/Aviso/frmEintragAviso.vb +++ b/Aviso/frmEintragAviso.vb @@ -518,6 +518,7 @@ Public Class frmEintragAviso lblErr_Grenzstelle.Visible = False lblErr_Uhrzeit.Visible = False lblErr_LKW.Visible = False + lblErr_KdNr.Visible = False lblSendungsanzahl.Visible = False lblErrVorraussuchtlEintreffen.Visible = False @@ -559,6 +560,19 @@ Public Class frmEintragAviso If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then + If Not cbxFrächterUnbekannt.Checked Then + If kdFrächter.KdNr_value <= 0 Then + kdFrächter.Focus() + lblErr_KdNr.Visible = True + Exit Sub + End If + End If + If kdAvisierer.KdNr_value <= 0 Then + kdAvisierer.Focus() + lblErr_KdNr.Visible = True + Exit Sub + End If + Else If cboGrenzstelle.Text.Trim = "" Then ' MsgBox("Bitte die Grenzstelle eingegeben.", vbInformation) @@ -1628,7 +1642,7 @@ Public Class frmEintragAviso kdFrächter.Text = "" kdFrächter.Enabled = False Else - kdFrächter.Enabled = False + kdFrächter.Enabled = True End If End Sub diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index d5d9e9f..d7bcdb5 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -10,6 +10,7 @@ Imports System.Drawing Imports Hardcodet.Wpf.TaskbarNotification Imports com.esendex.sdk.messaging Imports Newtonsoft.Json +Imports System.Reflection 'Imports UID @@ -74,6 +75,13 @@ Public Class frmHauptfenster Timer1_Tick(Timer1, New EventArgs) End Sub + Public Shared Sub EnableDoubleBuffered(ByRef dgv As DataGridView) + Dim dgvType As Type = dgv.[GetType]() + Dim pi As PropertyInfo = dgvType.GetProperty("DoubleBuffered", BindingFlags.Instance Or BindingFlags.NonPublic) + pi.SetValue(dgv, True, Nothing) + End Sub + + Private Sub frmMain_KeyDown(sender As Object, e As System.Windows.Forms.KeyEventArgs) Handles MyBase.KeyDown @@ -112,6 +120,22 @@ Public Class frmHauptfenster btnNeu.PerformClick() End If + If (e.KeyCode) = Keys.K AndAlso e.Control Then + If btnKunden.Visible Then btnKunden.PerformClick() + End If + If (e.KeyCode) = Keys.R AndAlso e.Control Then + If btnRg.Visible Then btnRg.PerformClick() + End If + If (e.KeyCode) = Keys.F AndAlso e.Control Then + If btnFakturierung.Visible Then btnFakturierung.PerformClick() + End If + If (e.KeyCode) = Keys.S AndAlso e.Control Then + If btnSpedBuch.Visible Then btnSpedBuch.PerformClick() + End If + If (e.KeyCode) = Keys.M AndAlso e.Control Then + If picAVISOMessenger.Visible Then PictureBox1_Click(picAVISOMessenger, New EventArgs) + End If + If e.KeyCode = Keys.D1 AndAlso e.Control Then tbcntrAviso.SelectedIndex = 1 : txtSuche.Focus() If e.KeyCode = Keys.D2 AndAlso e.Control Then tbcntrAviso.SelectedIndex = 2 : txtSuche.Focus() If (e.KeyCode) = Keys.D3 AndAlso e.Control Then tbcntrAviso.SelectedIndex = 3 : txtSuche.Focus() @@ -127,6 +151,8 @@ Public Class frmHauptfenster Me.AutoScaleMode = AutoScaleMode.Dpi hideErr.Interval = 3000 + EnableDoubleBuffered(gridAviso) + EnableDoubleBuffered(gridMyAviso) 'Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA ' Case "IMEX" ' FIMRA_COLOR = Color.FromArgb(250, 200, 0) @@ -1782,6 +1808,7 @@ Public Class frmHauptfenster Private Sub btnNeu_Click(sender As System.Object, e As System.EventArgs) Handles btnNeu.Click Try + Me.Cursor = Cursors.WaitCursor gridAviso.ClearSelection() gridMyAviso.ClearSelection() Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm() @@ -1797,6 +1824,7 @@ Public Class frmHauptfenster Catch ex As Exception End Try + Me.Cursor = Cursors.Default End Sub Private Sub btnLöschen_Click(sender As System.Object, e As System.EventArgs) @@ -1811,14 +1839,16 @@ Public Class frmHauptfenster End Sub Private Sub btnPaketdienst_Click(sender As System.Object, e As System.EventArgs) Handles btnKunden.Click + Me.Cursor = Cursors.WaitCursor 'For Each frm As Form In Application.OpenForms.Item("frmKundenUebersichtZOLL") Is Nothing If Not Application.OpenForms.Item("frmKundenUebersichtZOLL") Is Nothing Then Application.OpenForms.Item("frmKundenUebersichtZOLL").BringToFront() - Exit Sub + Me.Cursor = Cursors.Default : Exit Sub End If ' Next Dim zoll As New SDL.frmKundenUebersichtZOLL zoll.Show() + Me.Cursor = Cursors.Default End Sub Private Sub Button2_Click(sender As Object, e As EventArgs) Handles btnSpedBuch.Click @@ -1830,10 +1860,10 @@ Public Class frmHauptfenster Exit Sub End If Next - + Me.Cursor = Cursors.WaitCursor Dim sped As New SDL.frmSpeditionsbuchSuche sped.Show() - + Me.Cursor = Cursors.Default End If End Sub @@ -2436,7 +2466,7 @@ Public Class frmHauptfenster 'Me.Cursor = Cursors.WaitCursor Dim firma = "" - MsgBox("LOS" & vbNewLine & firma) + ' MsgBox("LOS" & vbNewLine & firma) Dim path = SDL.cFinanzOnlineWebService.genUID_Formular("ATU74813856") If path <> "" Then @@ -2513,30 +2543,30 @@ Public Class frmHauptfenster Optional isEmptyToNull As Boolean = False, Optional jsonSettings As JsonSerializerSettings = Nothing) As String - Dim response As String = String.Empty + Dim response As String = String.Empty - If Not EqualityComparer(Of T).Default.Equals(data, Nothing) Then - response = JsonConvert.SerializeObject(data, jsonSettings) - End If + If Not EqualityComparer(Of T).Default.Equals(data, Nothing) Then + response = JsonConvert.SerializeObject(data, jsonSettings) + End If - Return If(isEmptyToNull, (If(response = "{}", "null", response)), response) + Return If(isEmptyToNull, (If(response = "{}", "null", response)), response) - End Function + End Function - Public Function ToClass(Of T)(data As String, - Optional jsonSettings As JsonSerializerSettings = Nothing) As T + Public Function ToClass(Of T)(data As String, + Optional jsonSettings As JsonSerializerSettings = Nothing) As T - Dim response = Nothing + Dim response = Nothing - If Not String.IsNullOrEmpty(data) Then - response = If(jsonSettings Is Nothing, - JsonConvert.DeserializeObject(Of T)(data), - JsonConvert.DeserializeObject(Of T)(data, jsonSettings)) - End If + If Not String.IsNullOrEmpty(data) Then + response = If(jsonSettings Is Nothing, + JsonConvert.DeserializeObject(Of T)(data), + JsonConvert.DeserializeObject(Of T)(data, jsonSettings)) + End If - Return response + Return response - End Function + End Function Private Sub timerStandzeit_Tick(sender As Object, e As EventArgs) Handles timerStandzeit.Tick @@ -2832,9 +2862,10 @@ Public Class frmHauptfenster Exit Sub End If Next - + Me.Cursor = Cursors.WaitCursor Dim sped As New SDL.frmRechnungenSuche sped.Show() + Me.Cursor = Cursors.Default End Sub Private Sub TimerUPDATE_Tick(sender As Object, e As EventArgs) Handles TimerUPDATE.Tick @@ -3080,8 +3111,10 @@ Public Class frmHauptfenster End Sub Private Sub Button2_Click_2(sender As Object, e As EventArgs) Handles btnFakturierung.Click + Me.Cursor = Cursors.WaitCursor Dim f As New SDL.frmAbrechnungsMaske f.Show(Me) + Me.Cursor = Cursors.Default End Sub Private Sub ToolStripMenuItem1_Click_1(sender As Object, e As EventArgs) Handles ToolStripMenuItem1.Click @@ -3353,18 +3386,19 @@ Public Class frmHauptfenster End Sub Private Sub PictureBox1_Click(sender As Object, e As EventArgs) Handles picAVISOMessenger.Click - + Me.Cursor = Cursors.WaitCursor For Each openForm In Application.OpenForms() If TypeOf (openForm) Is VERAG_PROG_ALLGEMEIN.frmMessenger Then CType(openForm, VERAG_PROG_ALLGEMEIN.frmMessenger).WindowState = FormWindowState.Normal CType(openForm, VERAG_PROG_ALLGEMEIN.frmMessenger).BringToFront() - Exit Sub + Me.Cursor = Cursors.Default : Exit Sub End If Next Dim f As New VERAG_PROG_ALLGEMEIN.frmMessenger f.Location = Cursor.Position f.Show(Me) + Me.Cursor = Cursors.Default End Sub 'Private Sub TimerMessanger_NewMessages_Tick(sender As Object, e As EventArgs) Handles TimerMessanger_NewMessages.Tick @@ -3438,13 +3472,17 @@ Public Class frmHauptfenster End Sub Private Sub Button11_Click(sender As Object, e As EventArgs) Handles btnMAVerzeichnis.Click + Me.Cursor = Cursors.WaitCursor Dim f As New VERAG_PROG_ALLGEMEIN.frmMitarbeitersuche f.Show() + Me.Cursor = Cursors.Default End Sub Private Sub Button12_Click(sender As Object, e As EventArgs) Handles Button12.Click, Label22.Click + Me.Cursor = Cursors.WaitCursor Dim f As New frm_eAVISO f.Show() + Me.Cursor = Cursors.Default End Sub @@ -3532,13 +3570,13 @@ Public Class AvisoStatusFunctions 'End If ' If Aviso.Grenzstelle.Replace("???", "") <> "" Then If VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG <> "" Then - If Aviso.Grenzstelle <> VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG Then - Dim f As New frmAnkunftAendern(Aviso) + If Aviso.Grenzstelle <> VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG Then + Dim f As New frmAnkunftAendern(Aviso) If f.ShowDialog() Then Aviso.Grenzstelle = f.AVISO.Grenzstelle End If End If - End If + End If ' End If Aviso.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_Ankunft @@ -4158,7 +4196,7 @@ Public Class AvisoStatusFunctions 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 - VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.BESTAETIGEN_BENACHRICHTIGUNG_ALL(Aviso.AvisoID) + VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.BESTAETIGEN_BENACHRICHTIGUNG_ALL(Aviso.AvisoID, False) Else Aviso.Abgeschlossen = value AvisoDAL.SpeichernAviso(Aviso) @@ -4571,6 +4609,9 @@ Public Class AvisoStatusFunctions Dim tmpid = AvisoDAL.SpeichernAviso(Aviso) AvisoDAL.addAenderung(tmpid, "Akt übernommen", "Akt übernommen von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm")) + 'Benachrichtigungen erledigen 'nicht mehr, 16.07.2020 + 'VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.BESTAETIGEN_BENACHRICHTIGUNG_ALL(Aviso.AvisoID, True) + If askSendungenUebernehmen Or nurLeereSendungenUebernehmen Then Dim SENDUNG_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cSendungen) @@ -4731,6 +4772,10 @@ Public Class AvisoStatusFunctions If SENDUNG_TMP.SAVE() Then AvisoDAL.addAenderung(SENDUNG_TMP.tblSnd_AvisoID, "Sendung übernommen", "Sendung Nr. " & SENDUNG_TMP.tblSnd_PosUnterNr & If(GesendetAn, " gesendet an ", " übernommen von ") & MITARBEITER.Fullname & " am " & Format(Now, "dd.MM.yyyy HH:mm") & If(GesendetAn, " (von " & VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.Fullname & ")", "")) SENDUNG_TMP.saveSachbearbeiter = saveSachbearbeiterTmp + + 'Benachrichtigungen erledigen 'nicht mehr, 16.07.2020 + ' VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.BESTAETIGEN_BENACHRICHTIGUNG_SND(SENDUNG_TMP.tblSnd_SendungID, True) + Return True End If SENDUNG_TMP.saveSachbearbeiter = saveSachbearbeiterTmp @@ -4807,9 +4852,11 @@ Public Class AvisoStatusFunctions SENDUNG_TMP.saveSachbearbeiter = True If SENDUNG_TMP.tblSnd_Vorbereitet Is Nothing Then - If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "QS" Then - SENDUNG_TMP.tblSnd_QS_MA = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID - End If + SENDUNG_TMP.tblSnd_QS_MA = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID + SENDUNG_TMP.tblSnd_FilialeAbklaerung = VERAG_PROG_ALLGEMEIN.cAllgemein.getSTAMMFILIALE + 'If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "QS" Then + ' SENDUNG_TMP.tblSnd_QS_MA = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID + 'End If If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId IsNot Nothing Then SENDUNG_TMP.tblSnd_TeamId = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId SENDUNG_TMP.tblSnd_Vorbereitet = Now 'SENDUNG_TMP.tblSnd_Status=VERAG_PROG_ALLGEMEIN.vor ' Status macht keinen Sinn.. @@ -5100,7 +5147,7 @@ Public Class AvisoStatusFunctions Dim found = False Select Case s.tblSnd_Abfertigungsart_ID Case 5, 6, 18, 24, 32, 33, 34, 37, 40 - getDataFronDY_NCTS(s.tblSnd_SendungID, AtcMrn, frist, DsId, s.FilialenNr, s.AbfertigungsNr, s.tblSnd_Abfertigungsart_ID, s.tblSnd_DakosyRef) + getDataFronDY_NCTS(s.tblSnd_SendungID, AtcMrn, frist, DsId, s.FilialenNr, s.AbfertigungsNr, s.tblSnd_Abfertigungsart_ID, s.tblSnd_DakosyRef) If KUNDE_ERW.EmailFreigabe_VBDPDF And IsNumeric(DsId) Then 'VBD anhängen Try Dim PathTmp = (New VERAG_PROG_ALLGEMEIN.cDATENSERVER(DsId)).GET_TOP1_PATH(False) diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index a5d6272..d7bb0ec 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -2482,12 +2482,18 @@ Public Class frmSendungsdetailsNEU Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Case "IMEX" If cboFiliale._value <> "5501" Then sperren = True + If VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(cboFiliale._value) = "VERAG" AndAlso VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Then + sperren = False + End If Case "UNISPED" If cboFiliale._value <> "5601" Then sperren = True Case "VERAG" If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO") Then If cboFiliale._value = "5601" Or cboFiliale._value = "5501" Then sperren = True End If + If VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(cboFiliale._value) = "IMEX" AndAlso VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Then + sperren = False + End If End Select End If End If diff --git a/Aviso/packages.config b/Aviso/packages.config index b938281..b4fbfca 100644 --- a/Aviso/packages.config +++ b/Aviso/packages.config @@ -4,13 +4,17 @@ + + + + - + diff --git a/Aviso/usrcntlAktDetails.Designer.vb b/Aviso/usrcntlAktDetails.Designer.vb index 500a07f..fd75ca7 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 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 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 resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrcntlAktDetails)) - 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() + 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() Me.pnlDetailsRechts = New System.Windows.Forms.Panel() Me.Panel3 = New System.Windows.Forms.Panel() Me.SplitContainer = New System.Windows.Forms.SplitContainer() @@ -62,6 +62,7 @@ Partial Class usrcntlAktDetails Me.btn = New System.Windows.Forms.Button() Me.dgvSendungen = New System.Windows.Forms.DataGridView() Me.Panel7 = New System.Windows.Forms.Panel() + Me.picArrowDown = New System.Windows.Forms.PictureBox() Me.Panel4 = New System.Windows.Forms.Panel() Me.btnSendungslisteUNISPED = New System.Windows.Forms.Button() Me.cbxAlleFirmen = New System.Windows.Forms.CheckBox() @@ -156,6 +157,7 @@ Partial Class usrcntlAktDetails Me.grpAktVerzollung.SuspendLayout() Me.pnlSBG.SuspendLayout() CType(Me.dgvSendungen, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.picArrowDown, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel4.SuspendLayout() CType(Me.gridVermerke, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnlVermerkeTop.SuspendLayout() @@ -221,6 +223,7 @@ Partial Class usrcntlAktDetails ' 'SplitContainer.Panel2 ' + Me.SplitContainer.Panel2.Controls.Add(Me.picArrowDown) Me.SplitContainer.Panel2.Controls.Add(Me.Panel4) Me.SplitContainer.Panel2.Controls.Add(Me.Button18) Me.SplitContainer.Panel2.Controls.Add(Me.gridVermerke) @@ -557,44 +560,44 @@ Partial Class usrcntlAktDetails Me.dgvSendungen.AllowUserToAddRows = False Me.dgvSendungen.AllowUserToDeleteRows = False Me.dgvSendungen.AllowUserToResizeRows = False - DataGridViewCellStyle11.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSendungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSendungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.dgvSendungen.BackgroundColor = System.Drawing.Color.White - 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 + 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 Me.dgvSendungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - 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 + 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 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 - 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 + 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 Me.dgvSendungen.RowHeadersVisible = False Me.dgvSendungen.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSendungen.RowsDefaultCellStyle = DataGridViewCellStyle15 + DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSendungen.RowsDefaultCellStyle = DataGridViewCellStyle5 Me.dgvSendungen.RowTemplate.Height = 20 Me.dgvSendungen.RowTemplate.ReadOnly = True Me.dgvSendungen.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] @@ -616,6 +619,19 @@ Partial Class usrcntlAktDetails Me.Panel7.Size = New System.Drawing.Size(0, 30) Me.Panel7.TabIndex = 15 ' + 'picArrowDown + ' + Me.picArrowDown.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.picArrowDown.BackgroundImage = Global.AVISO.My.Resources.Resources.arrow_down_orange + Me.picArrowDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch + Me.picArrowDown.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.picArrowDown.Location = New System.Drawing.Point(1, 153) + Me.picArrowDown.Name = "picArrowDown" + Me.picArrowDown.Size = New System.Drawing.Size(34, 34) + Me.picArrowDown.TabIndex = 104 + Me.picArrowDown.TabStop = False + Me.picArrowDown.Visible = False + ' 'Panel4 ' Me.Panel4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -821,44 +837,44 @@ Partial Class usrcntlAktDetails Me.gridVermerke.AllowUserToAddRows = False Me.gridVermerke.AllowUserToDeleteRows = False Me.gridVermerke.AllowUserToResizeRows = False - DataGridViewCellStyle16.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle16 + DataGridViewCellStyle6.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6 Me.gridVermerke.BackgroundColor = System.Drawing.Color.White - 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 + 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 Me.gridVermerke.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - 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 + 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 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 - 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 + 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 Me.gridVermerke.RowHeadersVisible = False Me.gridVermerke.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle20 + DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle10 Me.gridVermerke.RowTemplate.Height = 20 Me.gridVermerke.RowTemplate.ReadOnly = True Me.gridVermerke.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] @@ -1802,6 +1818,7 @@ Partial Class usrcntlAktDetails Me.pnlSBG.ResumeLayout(False) Me.pnlSBG.PerformLayout() CType(Me.dgvSendungen, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.picArrowDown, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel4.ResumeLayout(False) Me.Panel4.PerformLayout() CType(Me.gridVermerke, System.ComponentModel.ISupportInitialize).EndInit() @@ -1948,4 +1965,5 @@ Partial Class usrcntlAktDetails Friend WithEvents Button13 As Button Friend WithEvents ToolUeberweisungsBeleg As ToolStripMenuItem Friend WithEvents toolVkReminder As ToolStripMenuItem + Friend WithEvents picArrowDown As PictureBox End Class diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index aa2564f..a09c7f9 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -691,6 +691,8 @@ Public Class usrcntlAktDetails End With End Select + ArrowDown_ShowHide() + End Sub @@ -740,7 +742,7 @@ Public Class usrcntlAktDetails Dim hSQL As String = " SELECT TOP 1000 [VermerkID],[AvisoID], [SendungID],[VermerkeCode], [Datum],[MitarbeiterId],tblSendungen.tblSnd_PosUnterNr,Hervorheben," & - " CASE WHEN VermerkeCode IS NULL OR VermerkeCode IN (25,28,29,30,35,46,47) THEN Hinweis_Vermerk ELSE VermerkeCodes.Bezeichnung END as [Hinweis_Vermerk_Anzeige],[Hinweis_Vermerk], tblSendungen.tblSnd_Empfaenger ,[Mitarbeiter]" & + " CASE WHEN VermerkeCode IS NULL OR VermerkeCode IN (13,25,28,29,30,35,46,47) THEN Hinweis_Vermerk ELSE VermerkeCodes.Bezeichnung END as [Hinweis_Vermerk_Anzeige],[Hinweis_Vermerk], tblSendungen.tblSnd_Empfaenger ,[Mitarbeiter]" & " FROM [Vermerke] LEFT JOIN VermerkeCodes ON [VermerkeCode]=VermerkeCodes.VermerkCodeId " & " LEFT JOIN tblSendungen ON [SendungID]=tblSendungen.tblSnd_SendungID " & " WHERE AvisoID = " & AvisoID & " " & sendwhere & " " & @@ -952,6 +954,7 @@ Public Class usrcntlAktDetails End Sub Private Sub gridVermerke_Paint(sender As Object, e As PaintEventArgs) Handles gridVermerke.Paint + If dgvSendungen.RowCount = 0 Then Exit Sub Try If gridVermerke.Columns("VermerkeOptions") Is Nothing Then Exit Sub @@ -965,78 +968,78 @@ Public Class usrcntlAktDetails End If If (r.Cells("VermerkeCode").Value) IsNot DBNull.Value Then - Select Case CInt(r.Cells("VermerkeCode").Value) - Case 1 - If Not existCodeInGridVermerke(2, CStr(r.Cells("Hinweis_Vermerk").Value)) Then - optionCell.Value = "Auftrag erhalten" - optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Auftrag erhalten' einzutragen." - End If - Case 3 - If Not existCodeInGridVermerke(4, CStr(r.Cells("Hinweis_Vermerk").Value)) Then - optionCell.Value = "Rechnung erhalten" - optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Rechnung erhalten' einzutragen." - End If - Case 5 - If Not existCodeInGridVermerke(6, CStr(r.Cells("Hinweis_Vermerk").Value)) Then - optionCell.Value = "LS erhalten" - optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'LS erhalten' einzutragen." - End If - Case 7 - If Not existCodeInGridVermerke(8, CStr(r.Cells("Hinweis_Vermerk").Value)) Then - optionCell.Value = "ATR erhalten" - optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'ATR erhalten' einzutragen." - End If - Case 9 - If Not existCodeInGridVermerke(10, CStr(r.Cells("Hinweis_Vermerk").Value)) Then - optionCell.Value = "Vollmacht erhalten" - optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Vollmacht erhalten' einzutragen." - End If - Case 11 - If Not existCodeInGridVermerke(12, CStr(r.Cells("Hinweis_Vermerk").Value)) Then - optionCell.Value = "CMR erhalten" - optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'CMR erhalten' einzutragen." - End If - Case 13 + Select Case CInt(r.Cells("VermerkeCode").Value) + Case 1 + If Not existCodeInGridVermerke(2, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + optionCell.Value = "Auftrag erhalten" + optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Auftrag erhalten' einzutragen." + End If + Case 3 + If Not existCodeInGridVermerke(4, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + optionCell.Value = "Rechnung erhalten" + optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Rechnung erhalten' einzutragen." + End If + Case 5 + If Not existCodeInGridVermerke(6, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + optionCell.Value = "LS erhalten" + optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'LS erhalten' einzutragen." + End If + Case 7 + If Not existCodeInGridVermerke(8, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + optionCell.Value = "ATR erhalten" + optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'ATR erhalten' einzutragen." + End If + Case 9 + If Not existCodeInGridVermerke(10, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + optionCell.Value = "Vollmacht erhalten" + optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Vollmacht erhalten' einzutragen." + End If + Case 11 + If Not existCodeInGridVermerke(12, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + optionCell.Value = "CMR erhalten" + optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'CMR erhalten' einzutragen." + End If + Case 13 If Not existCodeInGridVermerke(14) And Not existCodeInGridVermerke(59) Then optionCell.Value = "Vorauskasse erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Vorauskasse erhalten' einzutragen." End If Case 17 - If Not existCodeInGridVermerke(18) Then - optionCell.Value = "DE-ZOLL fertig" - optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'DE-ZOLL fertig' einzutragen." - End If - Case 19 - If Not existCodeInGridVermerke(20) Then - optionCell.Value = "AT-ZOLL fertig" - optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'AT-ZOLL fertig' einzutragen." - End If - Case 25 - If Not existCodeInGridVermerke(30, CStr(r.Cells("Hinweis_Vermerk").Value)) Then - optionCell.Value = "Dokument erhalten" - optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Dokument erhalten' einzutragen." - End If - Case 31 - If Not existCodeInGridVermerke(32, CStr(r.Cells("Hinweis_Vermerk").Value)) Then - optionCell.Value = "Vorbereitung abgeschlossen" - optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Vorbereitung abgeschlossen' einzutragen." - End If - Case 33 - If Not existCodeInGridVermerke(34, CStr(r.Cells("Hinweis_Vermerk").Value)) Then - optionCell.Value = "ATA-Nr. erhalten" - optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'ATA-Nr. erhalten' einzutragen." - End If - Case 36 - If Not existCodeInGridVermerke(37, CStr(r.Cells("Hinweis_Vermerk").Value)) Then - optionCell.Value = "Kontaktdaten erhalten" - optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Kontaktdaten erhalten' einzutragen." - End If - Case 53 - If Not existCodeInGridVermerke(54, CStr(r.Cells("Hinweis_Vermerk").Value)) Then - optionCell.Value = "Ü-Dok erhalten" - optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Ü-Dok erhalten' einzutragen." - End If - Case 55 + If Not existCodeInGridVermerke(18) Then + optionCell.Value = "DE-ZOLL fertig" + optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'DE-ZOLL fertig' einzutragen." + End If + Case 19 + If Not existCodeInGridVermerke(20) Then + optionCell.Value = "AT-ZOLL fertig" + optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'AT-ZOLL fertig' einzutragen." + End If + Case 25 + If Not existCodeInGridVermerke(30, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + optionCell.Value = "Dokument erhalten" + optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Dokument erhalten' einzutragen." + End If + Case 31 + If Not existCodeInGridVermerke(32, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + optionCell.Value = "Vorbereitung abgeschlossen" + optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Vorbereitung abgeschlossen' einzutragen." + End If + Case 33 + If Not existCodeInGridVermerke(34, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + optionCell.Value = "ATA-Nr. erhalten" + optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'ATA-Nr. erhalten' einzutragen." + End If + Case 36 + If Not existCodeInGridVermerke(37, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + optionCell.Value = "Kontaktdaten erhalten" + optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Kontaktdaten erhalten' einzutragen." + End If + Case 53 + If Not existCodeInGridVermerke(54, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + optionCell.Value = "Ü-Dok erhalten" + optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Ü-Dok erhalten' einzutragen." + End If + Case 55 If Not existCodeInGridVermerke(56, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Rg-Best. erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Rg-Best. erhalten' einzutragen." @@ -1059,14 +1062,38 @@ Public Class usrcntlAktDetails optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Absenderbestätigung erhalten' einzutragen." End If End Select - End If + End If + + Next + + Catch ex As Exception MsgBox(ex.Message & ex.StackTrace) End Try End Sub + Sub ArrowDown_ShowHide() + picArrowDown.Visible = False + If dgvSendungen.RowCount = 0 Then Exit Sub + Select Case tbcntlVermerke.SelectedIndex + Case 0, 1, 2 + Try + Dim showFirst = False + For Each r As DataGridViewRow In gridVermerke.Rows + If r.Displayed Then showFirst = True + If showFirst Then + If r.Cells("Hervorheben").Value = "1" AndAlso Not r.Displayed Then + picArrowDown.Visible = True + End If + End If + Next + Catch ex As Exception + MsgBox("ERR") + End Try + End Select + End Sub Function existCodeInGridVermerke(code As Integer, Optional text As String = "") As Boolean @@ -2341,6 +2368,7 @@ Public Class usrcntlAktDetails f.KundenNr = AVISO.Frächter_KdNr f.Kunde = AVISO.Frächter f.AvisoId = AVISO.AvisoID + f.Kennzeichen = AVISO.LKW_Nr End If If f.ShowDialog(Me) = DialogResult.OK Then If f.SMS IsNot Nothing Then @@ -2743,5 +2771,8 @@ Public Class usrcntlAktDetails End Sub + Private Sub gridVermerke_Scroll(sender As Object, e As ScrollEventArgs) Handles gridVermerke.Scroll + ArrowDown_ShowHide() + End Sub End Class diff --git a/Aviso/usrcntlAktDetailsATILLANeu.vb b/Aviso/usrcntlAktDetailsATILLANeu.vb index 656a067..45c600c 100644 --- a/Aviso/usrcntlAktDetailsATILLANeu.vb +++ b/Aviso/usrcntlAktDetailsATILLANeu.vb @@ -1279,6 +1279,7 @@ Public Class usrcntlAktDetailsATILLANeu f.KundenNr = AVISO.Frächter_KdNr f.Kunde = AVISO.Frächter f.AvisoId = AVISO.AvisoID + f.Kennzeichen = AVISO.LKW_Nr End If If f.ShowDialog(Me) = DialogResult.OK Then If f.SMS IsNot Nothing Then diff --git a/AvisoTV/My Project/Resources.Designer.vb b/AvisoTV/My Project/Resources.Designer.vb index aa10338..1617a71 100644 --- a/AvisoTV/My Project/Resources.Designer.vb +++ b/AvisoTV/My Project/Resources.Designer.vb @@ -71,7 +71,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die Data Source=[SQLGUIDE01.verag.ost.dmn];Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200 ähnelt. ''' Friend ReadOnly Property connStr_ATILLA() As String Get @@ -89,7 +89,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die Data Source=[SQLGUIDE01.verag.ost.dmn];Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200 ähnelt. ''' Friend ReadOnly Property connStr_VERAG() As String Get @@ -166,15 +166,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Sucht eine lokalisierte Zeichenfolge, die ähnelt. - ''' - Friend ReadOnly Property sda() As String - Get - Return ResourceManager.GetString("sda", resourceCulture) - End Get - End Property - ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/AvisoTV/My Project/Resources.resx b/AvisoTV/My Project/Resources.resx index 631afb3..9a81d6e 100644 --- a/AvisoTV/My Project/Resources.resx +++ b/AvisoTV/My Project/Resources.resx @@ -118,10 +118,10 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200 + Data Source=[SQLGUIDE01.verag.ost.dmn];Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200 - Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200 + Data Source=[SQLGUIDE01.verag.ost.dmn];Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200 @@ -148,9 +148,6 @@ ..\Resources\urgent_qu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\IMEX-LOGO_simple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/Diverses/arrow_down_orange.png b/Diverses/arrow_down_orange.png new file mode 100644 index 0000000..67f4812 Binary files /dev/null and b/Diverses/arrow_down_orange.png differ