From dbe63ae55a5bfe5c9a51e5975f4e6edf9df94acd Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Thu, 25 Nov 2021 14:09:40 +0100 Subject: [PATCH] neu --- Aviso/Aviso.vbproj | 52 +++++++------- Aviso/My Project/AssemblyInfo.vb | 4 +- Aviso/My Project/Resources.Designer.vb | 11 ++- Aviso/My Project/Resources.resx | 5 +- Aviso/My Project/licenses.licx | 5 +- Aviso/frmHauptfenster.vb | 8 +++ Aviso/frmSendungsdetailsNEU.Designer.vb | 93 +++++++++++++------------ Aviso/frmSendungsdetailsNEU.resx | 10 +-- Aviso/frmSendungsdetailsNEU.vb | 5 +- Aviso/rptAuswertung.vb | 4 +- Aviso/rptLKWBericht.vb | 4 +- Gemeinsames/Gemeinsames.vbproj | 31 ++++++--- Gemeinsames/My Project/licenses.licx | 1 + Gemeinsames/cReportExportierer.vb | 6 +- 14 files changed, 138 insertions(+), 101 deletions(-) create mode 100644 Gemeinsames/My Project/licenses.licx diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index 0f4a991..be0b804 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -109,8 +109,9 @@ - - ..\packages\Portable.BouncyCastle.1.8.5\lib\net40\BouncyCastle.Crypto.dll + + False + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\BouncyCastle.Crypto.dll ..\..\..\dll\HMRC\ChilkatDotNet47.dll @@ -126,31 +127,34 @@ False - C:\Program Files (x86)\Open XML SDK\V2.5\lib\DocumentFormat.OpenXml.dll - True + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\DocumentFormat.OpenXml.dll - - - - - - - - - - - - - - - - ..\packages\GrapeCity.Documents.Common.2.2.0.315\lib\net461\GrapeCity.Documents.Common.dll + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.dll - - ..\packages\GrapeCity.Documents.Imaging.2.2.0.315\lib\net461\GrapeCity.Documents.Imaging.dll + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Chart.dll - - ..\packages\GrapeCity.Documents.Pdf.2.2.0.315\lib\net461\GrapeCity.Documents.Pdf.dll + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Core.Document.dll + + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Document.dll + + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Export.Excel.dll + + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Export.Pdf.dll + + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Export.Word.dll + + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Viewer.Common.dll + + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Viewer.Win.dll ..\packages\itext7.7.1.11\lib\net40\itext.barcodes.dll diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index a374839..f6db28c 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 4912a4b..8098824 100644 --- a/Aviso/My Project/Resources.Designer.vb +++ b/Aviso/My Project/Resources.Designer.vb @@ -1179,6 +1179,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die ähnelt. + ''' + Friend ReadOnly Property sdf8sdfsidfsd8fsdjmkfsdfsdf() As String + Get + Return ResourceManager.GetString("sdf8sdfsidfsd8fsdjmkfsdfsdf", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -1539,7 +1548,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 3.7.1.4 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die 3.7.1.5 ähnelt. ''' Friend ReadOnly Property Version() As String Get diff --git a/Aviso/My Project/Resources.resx b/Aviso/My Project/Resources.resx index b0104ef..b49aa4c 100644 --- a/Aviso/My Project/Resources.resx +++ b/Aviso/My Project/Resources.resx @@ -536,7 +536,7 @@ ..\Resources\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - 3.7.1.4 + 3.7.1.5 ..\Resources\statusBtn_vorgeschrieben_Aktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -619,4 +619,7 @@ F:\Grafik\VERAG\VERAG_Akten\eigAkt\FO.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/My Project/licenses.licx b/Aviso/My Project/licenses.licx index 5e51f2f..fd38291 100644 --- a/Aviso/My Project/licenses.licx +++ b/Aviso/My Project/licenses.licx @@ -1,5 +1,2 @@ -GrapeCity.ActiveReports.SectionReport, GrapeCity.ActiveReports.v12, Version=12.2.13986.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff -GrapeCity.ActiveReports.Viewer.Win.Viewer, GrapeCity.ActiveReports.Viewer.Win.v12, Version=12.2.13986.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff +GrapeCity.ActiveReports.Viewer.Win.Viewer, GrapeCity.ActiveReports.Viewer.Win, Version=15.2.3.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff Spire.PdfViewer.Forms.PdfDocumentViewer, Spire.PdfViewer.Forms, Version=4.5.1.3046, Culture=neutral, PublicKeyToken=663f351905198cb3 -GrapeCity.ActiveReports.Export.Excel.Section.XlsExport, GrapeCity.ActiveReports.Export.Excel.v12, Version=12.2.13986.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff -GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport, GrapeCity.ActiveReports.Export.Pdf.v12, Version=12.2.13986.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index abcc82f..bce21d4 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -4100,6 +4100,14 @@ Public Class AvisoStatusFunctions If KundenNr Is Nothing OrElse Not IsNumeric(KundenNr) Then Exit Sub If KundenNr <= 0 Then Exit Sub + If art = 2 Then ' Freigabe + Dim KUNDE As New VERAG_PROG_ALLGEMEIN.cKunde(KundenNr) + Dim KUNDE_ERW As New VERAG_PROG_ALLGEMEIN.cKundenErweitert(KundenNr) + If KUNDE.EmailFreigabe And KUNDE_ERW.EmailFreigabe_Art = "BLG" Then + Exit Sub ' Keine Freigabe-Mail, wenn "BELEG" bei Freigabe gewählt wurde --> Der STB wird indem Fall pro Beleg geschickt. + End If + End If + Dim Standorte As New cStandorteDAL 'nur Mail erstellen, falls mindestens ein Empfänger vorhanden diff --git a/Aviso/frmSendungsdetailsNEU.Designer.vb b/Aviso/frmSendungsdetailsNEU.Designer.vb index cbbe350..446e57c 100644 --- a/Aviso/frmSendungsdetailsNEU.Designer.vb +++ b/Aviso/frmSendungsdetailsNEU.Designer.vb @@ -24,13 +24,13 @@ Partial Class frmSendungsdetailsNEU Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSendungsdetailsNEU)) - Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim 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 DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.pnl = New System.Windows.Forms.Panel() Me.Panel4 = New System.Windows.Forms.Panel() Me.TabControl1 = New System.Windows.Forms.TabControl() @@ -512,14 +512,14 @@ Partial Class frmSendungsdetailsNEU Me.dgvAnhang.AllowUserToResizeColumns = False Me.dgvAnhang.AllowUserToResizeRows = False Me.dgvAnhang.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, 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.dgvAnhang.DefaultCellStyle = DataGridViewCellStyle8 + DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvAnhang.DefaultCellStyle = DataGridViewCellStyle1 Me.dgvAnhang.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvAnhang.Location = New System.Drawing.Point(0, 45) Me.dgvAnhang.Name = "dgvAnhang" @@ -1393,44 +1393,44 @@ Partial Class frmSendungsdetailsNEU Me.gridVermerke.AllowUserToAddRows = False Me.gridVermerke.AllowUserToDeleteRows = False Me.gridVermerke.AllowUserToResizeRows = False - DataGridViewCellStyle9.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9 + DataGridViewCellStyle2.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 Me.gridVermerke.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle10.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle10.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle10 + DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle3.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle3.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle3 Me.gridVermerke.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridVermerke.DefaultCellStyle = DataGridViewCellStyle11 + DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window + 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.ControlText + DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridVermerke.DefaultCellStyle = DataGridViewCellStyle4 Me.gridVermerke.Dock = System.Windows.Forms.DockStyle.Fill Me.gridVermerke.Location = New System.Drawing.Point(0, 0) Me.gridVermerke.MultiSelect = False Me.gridVermerke.Name = "gridVermerke" Me.gridVermerke.ReadOnly = True - DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 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.gridVermerke.RowHeadersDefaultCellStyle = DataGridViewCellStyle12 + DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.RowHeadersDefaultCellStyle = DataGridViewCellStyle5 Me.gridVermerke.RowHeadersVisible = False Me.gridVermerke.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle13 + DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle6 Me.gridVermerke.RowTemplate.Height = 20 Me.gridVermerke.RowTemplate.ReadOnly = True Me.gridVermerke.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] @@ -2056,8 +2056,8 @@ Partial Class frmSendungsdetailsNEU 'clmnPreis ' Me.clmnPreis.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - DataGridViewCellStyle14.Format = "C2" - Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle14 + DataGridViewCellStyle7.Format = "C2" + Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle7 Me.clmnPreis.HeaderText = "Preis" Me.clmnPreis.MaxInputLength = 15 Me.clmnPreis.Name = "clmnPreis" @@ -4637,6 +4637,7 @@ Partial Class frmSendungsdetailsNEU ' Me.BindingNavigatorPositionItem.AccessibleName = "Position" Me.BindingNavigatorPositionItem.AutoSize = False + Me.BindingNavigatorPositionItem.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.BindingNavigatorPositionItem.Name = "BindingNavigatorPositionItem" Me.BindingNavigatorPositionItem.Size = New System.Drawing.Size(50, 23) Me.BindingNavigatorPositionItem.Text = "0" diff --git a/Aviso/frmSendungsdetailsNEU.resx b/Aviso/frmSendungsdetailsNEU.resx index bf3b8e4..8674326 100644 --- a/Aviso/frmSendungsdetailsNEU.resx +++ b/Aviso/frmSendungsdetailsNEU.resx @@ -1827,7 +1827,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + wAAADsABataJCQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA @@ -1839,7 +1839,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + wAAADsABataJCQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG @@ -1851,7 +1851,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + wAAADsABataJCQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG @@ -1862,7 +1862,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + wAAADsABataJCQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -1871,7 +1871,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + wAAADsABataJCQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index 494f591..d000f66 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -1617,11 +1617,10 @@ Public Class frmSendungsdetailsNEU SENDUNG_LIST(CURRENT_INDEX).tblSnd_Fremdspedition = cbxFremdspedition.Checked SENDUNG_LIST(CURRENT_INDEX).tblSnd_FremdspeditionText = cboFremdsped.Text - SENDUNG_LIST(CURRENT_INDEX).tblSnd_KdAuftragsNr = txtKdAuftragsNr.Text SENDUNG_LIST(CURRENT_INDEX).tblSnd_DakosyRef = txtDyRef.Text - + SENDUNG_LIST(CURRENT_INDEX).tblSnd_KdAuftragsNr = txtKdAuftragsNr.Text 'Auftrgeb SENDUNG_LIST(CURRENT_INDEX).tblSnd_KdAuftragsNrAvisierer = txtKdAuftragsNrAvisierer.Text SENDUNG_LIST(CURRENT_INDEX).tblSnd_KdAuftragsNrEmpfaenger = txtKdAuftragsNrEmpfaenger.Text SENDUNG_LIST(CURRENT_INDEX).tblSnd_KdAuftragsNrFrachtfuehrer = txtKdAuftragsNrFrachtfuehrer.Text @@ -4720,4 +4719,6 @@ Public Class frmSendungsdetailsNEU Next End Sub + + End Class diff --git a/Aviso/rptAuswertung.vb b/Aviso/rptAuswertung.vb index 39e7c4b..8017507 100644 --- a/Aviso/rptAuswertung.vb +++ b/Aviso/rptAuswertung.vb @@ -117,9 +117,9 @@ Public Class rptAuswertung 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail1.BackColor = Drawing.Color.White + Detail1.BackColor = Color.White Else - Detail1.BackColor = Drawing.Color.WhiteSmoke + Detail1.BackColor = Color.WhiteSmoke End If End Sub End Class diff --git a/Aviso/rptLKWBericht.vb b/Aviso/rptLKWBericht.vb index dc99fa9..de274c9 100644 --- a/Aviso/rptLKWBericht.vb +++ b/Aviso/rptLKWBericht.vb @@ -25,9 +25,9 @@ Public Class rptLKWBericht ' MsgBox(Fields.Item("Ereignis").Value) 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail.BackColor = Drawing.Color.White + Detail.BackColor = Color.White Else - Detail.BackColor = Drawing.Color.WhiteSmoke + Detail.BackColor = Color.WhiteSmoke End If End Sub diff --git a/Gemeinsames/Gemeinsames.vbproj b/Gemeinsames/Gemeinsames.vbproj index d79a4e3..d0cf1de 100644 --- a/Gemeinsames/Gemeinsames.vbproj +++ b/Gemeinsames/Gemeinsames.vbproj @@ -90,15 +90,27 @@ - - - - - - - - - + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.dll + + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Core.Document.dll + + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Document.dll + + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Export.Excel.dll + + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Export.Pdf.dll + + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Export.Rdf.dll + + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Viewer.Win.dll + @@ -195,6 +207,7 @@ frmGrayOut.vb + VbMyResourcesResXFileCodeGenerator Resources.Designer.vb diff --git a/Gemeinsames/My Project/licenses.licx b/Gemeinsames/My Project/licenses.licx new file mode 100644 index 0000000..7483222 --- /dev/null +++ b/Gemeinsames/My Project/licenses.licx @@ -0,0 +1 @@ +GrapeCity.ActiveReports.SectionReport, GrapeCity.ActiveReports, Version=15.2.3.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff diff --git a/Gemeinsames/cReportExportierer.vb b/Gemeinsames/cReportExportierer.vb index c2ed2f6..d6dcc65 100644 --- a/Gemeinsames/cReportExportierer.vb +++ b/Gemeinsames/cReportExportierer.vb @@ -26,9 +26,9 @@ Public Class cReportExportierer Dim xlsExport1 As New GrapeCity.ActiveReports.Export.Excel.Section.XlsExport() xlsExport1.FileFormat = GrapeCity.ActiveReports.Export.Excel.Section.FileFormat.Xlsx xlsExport1.Export(document, datei.FullName) - Case ".rtf".ToUpper() - Dim rtfExport1 As New GrapeCity.ActiveReports.Export.Word.Section.RtfExport() - rtfExport1.Export(document, datei.FullName) + 'Case ".rtf".ToUpper() + ' Dim rtfExport1 As New GrapeCity.ActiveReports.Export.Word.Section.RtfExport() + ' rtfExport1.Export(document, datei.FullName) Case Else MessageBox.Show("Es würde ein ungültiges Exportformat ausgewählt. Erlaubt sind 'pdf', 'rtf' und 'xlsx'.") Exit Sub