MS Änderungen 11.06

SchaumKommiCollo/KommiCollo/KommiCollo.vbproj.user

@@ -3,4 +3,8 @@
   <PropertyGroup>
     <ProjectView>ShowAllFiles</ProjectView>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <EnableSQLServerDebugging>false</EnableSQLServerDebugging>
+    <EnableUnmanagedDebugging>true</EnableUnmanagedDebugging>
+  </PropertyGroup>
 </Project>

SchaumKommiCollo/KommiCollo/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.1.0.0")>
+<Assembly: AssemblyVersion("2.2.0.1")>
 <Assembly: AssemblyFileVersion("1.0.0.0")> 

SchaumKommiCollo/KommiCollo/bin/Debug/KommiCollo.xml

@@ -278,6 +278,11 @@ Represents the strongly named DataTable class.
 Represents the strongly named DataTable class.
 </summary>
 </member>
+<member name="T:KommiCollo.MyDataset.VWKOMMCOLLI_UEBERSICHTDataTable">
+<summary>
+Represents the strongly named DataTable class.
+</summary>
+</member>
 <member name="T:KommiCollo.MyDataset.TBKOMMCOLLI_MANDANTRow">
 <summary>
 Represents strongly named DataRow class.
@@ -333,6 +338,11 @@ Represents strongly named DataRow class.
 Represents strongly named DataRow class.
 </summary>
 </member>
+<member name="T:KommiCollo.MyDataset.VWKOMMCOLLI_UEBERSICHTRow">
+<summary>
+Represents strongly named DataRow class.
+</summary>
+</member>
 <member name="T:KommiCollo.MyDataset.TBKOMMCOLLI_MANDANTRowChangeEvent">
 <summary>
 Row event argument class
@@ -388,6 +398,11 @@ Row event argument class
 Row event argument class
 </summary>
 </member>
+<member name="T:KommiCollo.MyDataset.VWKOMMCOLLI_UEBERSICHTRowChangeEvent">
+<summary>
+Row event argument class
+</summary>
+</member>
 <member name="T:KommiCollo.MyDatasetTableAdapters.TBKOMMCOLLI_MANDANTTableAdapter">
 <summary>
 Represents the connection and commands used to retrieve and save data.
@@ -443,6 +458,11 @@ Represents the connection and commands used to retrieve and save data.
 Represents the connection and commands used to retrieve and save data.
 </summary>
 </member>
+<member name="T:KommiCollo.MyDatasetTableAdapters.VWKOMMCOLLI_UEBERSICHTTableAdapter">
+<summary>
+Represents the connection and commands used to retrieve and save data.
+</summary>
+</member>
 <member name="T:KommiCollo.MyDatasetTableAdapters.TableAdapterManager">
 <summary>
 TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios
@@ -483,5 +503,14 @@ Update Order Option
 Used to sort self-referenced table's rows
 </summary>
 </member>
+<member name="T:KommiCollo.reportUebergabe">
+ <summary>
+     Hier werden die Summen von
+         - Anzahl Sendungen
+         - Anzahl Kolli
+         - Gesamtgewicht
+     berechnet.
+ </summary>
+</member>
 </members>
 </doc>

SchaumKommiCollo/KommiCollo/frmAbschluss.Designer.vb

@@ -30,6 +30,12 @@ Partial Class frmAbschluss
         Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
         Me.VWAbschlussDataGridView = New System.Windows.Forms.DataGridView()
         Me.Auswahl = New System.Windows.Forms.DataGridViewCheckBoxColumn()
+        Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.DataGridViewTextBoxColumn4 = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.VWAbschlussBindingSource = New System.Windows.Forms.BindingSource(Me.components)
+        Me.MyDataset = New KommiCollo.MyDataset()
         Me.Panel1 = New System.Windows.Forms.Panel()
         Me.Label1 = New System.Windows.Forms.Label()
         Me.cmbMandant = New System.Windows.Forms.ComboBox()
@@ -37,18 +43,13 @@ Partial Class frmAbschluss
         Me.btnAbschluss = New System.Windows.Forms.Button()
         Me.Panel2 = New System.Windows.Forms.Panel()
         Me.VWKOMMCOLLI_UEBERSICHTDataGridView = New System.Windows.Forms.DataGridView()
+        Me.VWKOMMCOLLI_UEBERSICHTBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.DSMercator = New KommiCollo.DSMercator()
         Me.VKKOPFBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.VKKOPFTableAdapter = New KommiCollo.DSMercatorTableAdapters.VKKOPFTableAdapter()
         Me.TableAdapterManager1 = New KommiCollo.DSMercatorTableAdapters.TableAdapterManager()
         Me.bw_Tagesabschluss = New System.ComponentModel.BackgroundWorker()
         Me.VWHUP_REPORT1BindingSource = New System.Windows.Forms.BindingSource(Me.components)
-        Me.MyDataset = New KommiCollo.MyDataset()
-        Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.DataGridViewTextBoxColumn4 = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.VWAbschlussBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.VWAbschlussTableAdapter = New KommiCollo.MyDatasetTableAdapters.VWKOMMCOLLI_ABSCHLUSS_PAKETTableAdapter()
         Me.TableAdapterManager = New KommiCollo.MyDatasetTableAdapters.TableAdapterManager()
         Me.TBKOMMCOLLI_MANDANTBindingSource = New System.Windows.Forms.BindingSource(Me.components)
@@ -60,33 +61,34 @@ Partial Class frmAbschluss
         Me.TBKOMMCOLLI_PAKET_POS_LSBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.TBKOMMCOLLI_PAKET_POS_LSTableAdapter = New KommiCollo.MyDatasetTableAdapters.TBKOMMCOLLI_PAKET_POS_LSTableAdapter()
         Me.VWHUP_REPORT1TableAdapter = New KommiCollo.MyDatasetTableAdapters.VWHUP_REPORT1TableAdapter()
-        Me.VWKOMMCOLLI_UEBERSICHTBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.VWKOMMCOLLI_UEBERSICHTTableAdapter = New KommiCollo.MyDatasetTableAdapters.VWKOMMCOLLI_UEBERSICHTTableAdapter()
-        Me.Selected = New System.Windows.Forms.DataGridViewCheckBoxColumn()
+        Me.DataGridViewCheckBoxColumn2 = New System.Windows.Forms.DataGridViewCheckBoxColumn()
+        Me.SELECTED = New System.Windows.Forms.DataGridViewCheckBoxColumn()
         Me.UEBERTRAGEN = New System.Windows.Forms.DataGridViewCheckBoxColumn()
         Me.GUID = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.ABHOLDATUM = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.SDG_GEWICHT = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.BORDERONR = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.LAD1DataGridViewTextBoxColumn = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.EMP = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.LADSTRASSEDataGridViewTextBoxColumn = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.EMP_ZUSATZ = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.LADLKZPLZORTDataGridViewTextBoxColumn = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.EMP_PLZ_STR = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.EMP_ORT = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.FERTIGDataGridViewCheckBoxColumn = New System.Windows.Forms.DataGridViewCheckBoxColumn()
         Me.ToolStrip1.SuspendLayout()
         CType(Me.VWAbschlussDataGridView, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.VWAbschlussBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel1.SuspendLayout()
         Me.Panel2.SuspendLayout()
         CType(Me.VWKOMMCOLLI_UEBERSICHTDataGridView, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.VWKOMMCOLLI_UEBERSICHTBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.DSMercator, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.VKKOPFBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.VWHUP_REPORT1BindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.VWAbschlussBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBKOMMCOLLI_MANDANTBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBKOMMCOLLI_PAKET_POSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBKOMMCOLLI_PAKET_KOPFBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBKOMMCOLLI_PAKET_POS_LSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.VWKOMMCOLLI_UEBERSICHTBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'ToolStrip1
@@ -144,6 +146,44 @@ Partial Class frmAbschluss
         Me.Auswahl.Name = "Auswahl"
         Me.Auswahl.Width = 60
         '
+        'DataGridViewTextBoxColumn1
+        '
+        Me.DataGridViewTextBoxColumn1.DataPropertyName = "GUID"
+        Me.DataGridViewTextBoxColumn1.HeaderText = "ID"
+        Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1"
+        Me.DataGridViewTextBoxColumn1.ReadOnly = True
+        Me.DataGridViewTextBoxColumn1.Width = 60
+        '
+        'DataGridViewTextBoxColumn2
+        '
+        Me.DataGridViewTextBoxColumn2.DataPropertyName = "Mandant"
+        Me.DataGridViewTextBoxColumn2.HeaderText = "Mandant"
+        Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2"
+        '
+        'DataGridViewTextBoxColumn3
+        '
+        Me.DataGridViewTextBoxColumn3.DataPropertyName = "PAKET_ID"
+        Me.DataGridViewTextBoxColumn3.HeaderText = "Paket-ID"
+        Me.DataGridViewTextBoxColumn3.Name = "DataGridViewTextBoxColumn3"
+        Me.DataGridViewTextBoxColumn3.Width = 130
+        '
+        'DataGridViewTextBoxColumn4
+        '
+        Me.DataGridViewTextBoxColumn4.DataPropertyName = "Gepackt"
+        Me.DataGridViewTextBoxColumn4.HeaderText = "Gepackt"
+        Me.DataGridViewTextBoxColumn4.Name = "DataGridViewTextBoxColumn4"
+        Me.DataGridViewTextBoxColumn4.Width = 150
+        '
+        'VWAbschlussBindingSource
+        '
+        Me.VWAbschlussBindingSource.DataMember = "VWKOMMCOLLI_ABSCHLUSS_PAKET"
+        Me.VWAbschlussBindingSource.DataSource = Me.MyDataset
+        '
+        'MyDataset
+        '
+        Me.MyDataset.DataSetName = "MyDataset"
+        Me.MyDataset.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
+        '
         'Panel1
         '
         Me.Panel1.Controls.Add(Me.Label1)
@@ -216,7 +256,7 @@ Partial Class frmAbschluss
         Me.VWKOMMCOLLI_UEBERSICHTDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
         Me.VWKOMMCOLLI_UEBERSICHTDataGridView.AutoGenerateColumns = False
         Me.VWKOMMCOLLI_UEBERSICHTDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.VWKOMMCOLLI_UEBERSICHTDataGridView.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.Selected, Me.UEBERTRAGEN, Me.GUID, Me.ABHOLDATUM, Me.SDG_GEWICHT, Me.BORDERONR, Me.LAD1DataGridViewTextBoxColumn, Me.LADSTRASSEDataGridViewTextBoxColumn, Me.LADLKZPLZORTDataGridViewTextBoxColumn, Me.FERTIGDataGridViewCheckBoxColumn})
+        Me.VWKOMMCOLLI_UEBERSICHTDataGridView.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewCheckBoxColumn2, Me.SELECTED, Me.UEBERTRAGEN, Me.GUID, Me.ABHOLDATUM, Me.SDG_GEWICHT, Me.BORDERONR, Me.EMP, Me.EMP_ZUSATZ, Me.EMP_PLZ_STR, Me.EMP_ORT, Me.FERTIGDataGridViewCheckBoxColumn})
         Me.VWKOMMCOLLI_UEBERSICHTDataGridView.DataSource = Me.VWKOMMCOLLI_UEBERSICHTBindingSource
         Me.VWKOMMCOLLI_UEBERSICHTDataGridView.Location = New System.Drawing.Point(40, 130)
         Me.VWKOMMCOLLI_UEBERSICHTDataGridView.Name = "VWKOMMCOLLI_UEBERSICHTDataGridView"
@@ -224,6 +264,11 @@ Partial Class frmAbschluss
         Me.VWKOMMCOLLI_UEBERSICHTDataGridView.TabIndex = 2
         Me.VWKOMMCOLLI_UEBERSICHTDataGridView.Visible = False
         '
+        'VWKOMMCOLLI_UEBERSICHTBindingSource
+        '
+        Me.VWKOMMCOLLI_UEBERSICHTBindingSource.DataMember = "VWKOMMCOLLI_UEBERSICHT"
+        Me.VWKOMMCOLLI_UEBERSICHTBindingSource.DataSource = Me.MyDataset
+        '
         'DSMercator
         '
         Me.DSMercator.DataSetName = "DSMercator"
@@ -252,44 +297,6 @@ Partial Class frmAbschluss
         Me.VWHUP_REPORT1BindingSource.DataMember = "VWHUP_REPORT1"
         Me.VWHUP_REPORT1BindingSource.DataSource = Me.MyDataset
         '
-        'MyDataset
-        '
-        Me.MyDataset.DataSetName = "MyDataset"
-        Me.MyDataset.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
-        '
-        'DataGridViewTextBoxColumn1
-        '
-        Me.DataGridViewTextBoxColumn1.DataPropertyName = "GUID"
-        Me.DataGridViewTextBoxColumn1.HeaderText = "ID"
-        Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1"
-        Me.DataGridViewTextBoxColumn1.ReadOnly = True
-        Me.DataGridViewTextBoxColumn1.Width = 60
-        '
-        'DataGridViewTextBoxColumn2
-        '
-        Me.DataGridViewTextBoxColumn2.DataPropertyName = "Mandant"
-        Me.DataGridViewTextBoxColumn2.HeaderText = "Mandant"
-        Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2"
-        '
-        'DataGridViewTextBoxColumn3
-        '
-        Me.DataGridViewTextBoxColumn3.DataPropertyName = "PAKET_ID"
-        Me.DataGridViewTextBoxColumn3.HeaderText = "Paket-ID"
-        Me.DataGridViewTextBoxColumn3.Name = "DataGridViewTextBoxColumn3"
-        Me.DataGridViewTextBoxColumn3.Width = 130
-        '
-        'DataGridViewTextBoxColumn4
-        '
-        Me.DataGridViewTextBoxColumn4.DataPropertyName = "Gepackt"
-        Me.DataGridViewTextBoxColumn4.HeaderText = "Gepackt"
-        Me.DataGridViewTextBoxColumn4.Name = "DataGridViewTextBoxColumn4"
-        Me.DataGridViewTextBoxColumn4.Width = 150
-        '
-        'VWAbschlussBindingSource
-        '
-        Me.VWAbschlussBindingSource.DataMember = "VWKOMMCOLLI_ABSCHLUSS_PAKET"
-        Me.VWAbschlussBindingSource.DataSource = Me.MyDataset
-        '
         'VWAbschlussTableAdapter
         '
         Me.VWAbschlussTableAdapter.ClearBeforeFill = True
@@ -345,21 +352,24 @@ Partial Class frmAbschluss
         '
         Me.VWHUP_REPORT1TableAdapter.ClearBeforeFill = True
         '
-        'VWKOMMCOLLI_UEBERSICHTBindingSource
-        '
-        Me.VWKOMMCOLLI_UEBERSICHTBindingSource.DataMember = "VWKOMMCOLLI_UEBERSICHT"
-        Me.VWKOMMCOLLI_UEBERSICHTBindingSource.DataSource = Me.MyDataset
-        '
         'VWKOMMCOLLI_UEBERSICHTTableAdapter
         '
         Me.VWKOMMCOLLI_UEBERSICHTTableAdapter.ClearBeforeFill = True
         '
-        'Selected
+        'DataGridViewCheckBoxColumn2
         '
-        Me.Selected.FalseValue = "False"
+        Me.DataGridViewCheckBoxColumn2.FalseValue = "False"
-        Me.Selected.HeaderText = "Löschen"
+        Me.DataGridViewCheckBoxColumn2.Frozen = True
-        Me.Selected.Name = "Selected"
+        Me.DataGridViewCheckBoxColumn2.HeaderText = "Löschen"
-        Me.Selected.TrueValue = "True"
+        Me.DataGridViewCheckBoxColumn2.Name = "DataGridViewCheckBoxColumn2"
+        Me.DataGridViewCheckBoxColumn2.TrueValue = "True"
+        '
+        'SELECTED
+        '
+        Me.SELECTED.DataPropertyName = "SELECTED"
+        Me.SELECTED.Frozen = True
+        Me.SELECTED.HeaderText = "Auswahl"
+        Me.SELECTED.Name = "SELECTED"
         '
         'UEBERTRAGEN
         '
@@ -392,24 +402,33 @@ Partial Class frmAbschluss
         Me.BORDERONR.HeaderText = "BORDERONR"
         Me.BORDERONR.Name = "BORDERONR"
         '
-        'LAD1DataGridViewTextBoxColumn
+        'EMP
         '
-        Me.LAD1DataGridViewTextBoxColumn.DataPropertyName = "LAD1"
+        Me.EMP.DataPropertyName = "EMP"
-        Me.LAD1DataGridViewTextBoxColumn.HeaderText = "LAD1"
+        Me.EMP.HeaderText = "EMP"
-        Me.LAD1DataGridViewTextBoxColumn.Name = "LAD1DataGridViewTextBoxColumn"
+        Me.EMP.Name = "EMP"
+        Me.EMP.ReadOnly = True
         '
-        'LADSTRASSEDataGridViewTextBoxColumn
+        'EMP_ZUSATZ
         '
-        Me.LADSTRASSEDataGridViewTextBoxColumn.DataPropertyName = "LAD_STRASSE"
+        Me.EMP_ZUSATZ.DataPropertyName = "EMP_ZUSATZ"
-        Me.LADSTRASSEDataGridViewTextBoxColumn.HeaderText = "LAD_STRASSE"
+        Me.EMP_ZUSATZ.HeaderText = "EMP_ZUSATZ"
-        Me.LADSTRASSEDataGridViewTextBoxColumn.Name = "LADSTRASSEDataGridViewTextBoxColumn"
+        Me.EMP_ZUSATZ.Name = "EMP_ZUSATZ"
+        Me.EMP_ZUSATZ.ReadOnly = True
         '
-        'LADLKZPLZORTDataGridViewTextBoxColumn
+        'EMP_PLZ_STR
         '
-        Me.LADLKZPLZORTDataGridViewTextBoxColumn.DataPropertyName = "LAD_LKZ_PLZ_ORT"
+        Me.EMP_PLZ_STR.DataPropertyName = "EMP_PLZ_STR"
-        Me.LADLKZPLZORTDataGridViewTextBoxColumn.HeaderText = "LAD_LKZ_PLZ_ORT"
+        Me.EMP_PLZ_STR.HeaderText = "EMP_PLZ_STR"
-        Me.LADLKZPLZORTDataGridViewTextBoxColumn.Name = "LADLKZPLZORTDataGridViewTextBoxColumn"
+        Me.EMP_PLZ_STR.Name = "EMP_PLZ_STR"
-        Me.LADLKZPLZORTDataGridViewTextBoxColumn.ReadOnly = True
+        Me.EMP_PLZ_STR.ReadOnly = True
+        '
+        'EMP_ORT
+        '
+        Me.EMP_ORT.DataPropertyName = "EMP_ORT"
+        Me.EMP_ORT.HeaderText = "EMP_ORT"
+        Me.EMP_ORT.Name = "EMP_ORT"
+        Me.EMP_ORT.ReadOnly = True
         '
         'FERTIGDataGridViewCheckBoxColumn
         '
@@ -433,20 +452,20 @@ Partial Class frmAbschluss
         Me.ToolStrip1.ResumeLayout(False)
         Me.ToolStrip1.PerformLayout()
         CType(Me.VWAbschlussDataGridView, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.VWAbschlussBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).EndInit()
         Me.Panel1.ResumeLayout(False)
         Me.Panel1.PerformLayout()
         Me.Panel2.ResumeLayout(False)
         CType(Me.VWKOMMCOLLI_UEBERSICHTDataGridView, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.VWKOMMCOLLI_UEBERSICHTBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.DSMercator, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.VKKOPFBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.VWHUP_REPORT1BindingSource, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.VWAbschlussBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TBKOMMCOLLI_MANDANTBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TBKOMMCOLLI_PAKET_POSBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TBKOMMCOLLI_PAKET_KOPFBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TBKOMMCOLLI_PAKET_POS_LSBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.VWKOMMCOLLI_UEBERSICHTBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -490,14 +509,16 @@ Partial Class frmAbschluss
     Friend WithEvents VWKOMMCOLLI_UEBERSICHTDataGridView As DataGridView
     Friend WithEvents VWKOMMCOLLI_UEBERSICHTBindingSource As BindingSource
     Friend WithEvents VWKOMMCOLLI_UEBERSICHTTableAdapter As MyDatasetTableAdapters.VWKOMMCOLLI_UEBERSICHTTableAdapter
-    Friend WithEvents Selected As DataGridViewCheckBoxColumn
+    Friend WithEvents DataGridViewCheckBoxColumn2 As DataGridViewCheckBoxColumn
+    Friend WithEvents SELECTED As DataGridViewCheckBoxColumn
     Friend WithEvents UEBERTRAGEN As DataGridViewCheckBoxColumn
     Friend WithEvents GUID As DataGridViewTextBoxColumn
     Friend WithEvents ABHOLDATUM As DataGridViewTextBoxColumn
     Friend WithEvents SDG_GEWICHT As DataGridViewTextBoxColumn
     Friend WithEvents BORDERONR As DataGridViewTextBoxColumn
-    Friend WithEvents LAD1DataGridViewTextBoxColumn As DataGridViewTextBoxColumn
+    Friend WithEvents EMP As DataGridViewTextBoxColumn
-    Friend WithEvents LADSTRASSEDataGridViewTextBoxColumn As DataGridViewTextBoxColumn
+    Friend WithEvents EMP_ZUSATZ As DataGridViewTextBoxColumn
-    Friend WithEvents LADLKZPLZORTDataGridViewTextBoxColumn As DataGridViewTextBoxColumn
+    Friend WithEvents EMP_PLZ_STR As DataGridViewTextBoxColumn
+    Friend WithEvents EMP_ORT As DataGridViewTextBoxColumn
     Friend WithEvents FERTIGDataGridViewCheckBoxColumn As DataGridViewCheckBoxColumn
 End Class

SchaumKommiCollo/KommiCollo/frmAbschluss.resx

@@ -129,7 +129,10 @@
   <metadata name="MyDataset.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="Selected.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="DataGridViewCheckBoxColumn2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SELECTED.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="UEBERTRAGEN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -147,6 +150,18 @@
   <metadata name="BORDERONR.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="EMP.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="EMP_ZUSATZ.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="EMP_PLZ_STR.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="EMP_ORT.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="VWKOMMCOLLI_UEBERSICHTBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 134</value>
   </metadata>

SchaumKommiCollo/KommiCollo/frmAbschluss.vb

@@ -2,15 +2,22 @@
     Dim Mandant As String
     Dim Mandant_ID As Integer
     Private Sub frmAbschluss_Load(sender As System.Object, e As System.EventArgs) Handles MyBase.Load
-        'TODO: Diese Codezeile lädt Daten in die Tabelle "MyDataset.VWKOMMCOLLI_UEBERSICHT". Sie können sie bei Bedarf verschieben oder entfernen.
+
-        Me.VWKOMMCOLLI_UEBERSICHTTableAdapter.Fill(Me.MyDataset.VWKOMMCOLLI_UEBERSICHT)
         Try
+            If (System.Diagnostics.Debugger.IsAttached) = False Then
+                My.Settings.ConfigConnectionString = "Data Source=192.168.13.101;Initial Catalog=SCHAUM_IID;Persist Security Info=True;User ID=sa;Password=dd"
+                My.Settings.ConfigConnStringMercator = "Data Source=192.168.13.101;Initial Catalog=CP2DD;Persist Security Info=True;User ID=sa;Password=dd"
+                My.Settings.Save()
+            End If
+
             Me.VWAbschlussTableAdapter.Connection.ConnectionString = My.Settings.ConfigConnectionString
             Me.TBKOMMCOLLI_MANDANTTableAdapter.Connection.ConnectionString = My.Settings.ConfigConnectionString
             Me.TBKOMMCOLLI_PAKET_KOPFTableAdapter.Connection.ConnectionString = My.Settings.ConfigConnectionString
             Me.TBKOMMCOLLI_PAKET_POSTableAdapter.Connection.ConnectionString = My.Settings.ConfigConnectionString
             Me.TBKOMMCOLLI_PAKET_POS_LSTableAdapter.Connection.ConnectionString = My.Settings.ConfigConnectionString
-
+            'TODO: Diese Codezeile lädt Daten in die Tabelle "MyDataset.VWKOMMCOLLI_UEBERSICHT". Sie können sie bei Bedarf verschieben oder entfernen.
+            Me.VWKOMMCOLLI_UEBERSICHTTableAdapter.Connection.ConnectionString = My.Settings.ConfigConnectionString
+            Me.VWKOMMCOLLI_UEBERSICHTTableAdapter.Fill(Me.MyDataset.VWKOMMCOLLI_UEBERSICHT)
             Me.VKKOPFTableAdapter.Connection.ConnectionString = My.Settings.ConfigConnStringMercator
 
             Me.TBKOMMCOLLI_MANDANTTableAdapter.Fill(MyDataset.TBKOMMCOLLI_MANDANT)
@@ -163,7 +170,7 @@
                     ZeilenBuilder.Append(";")
 
                 Else
-                    MsgBox("Fehler beim Abschluss des Pakets '" & PAKET_ID & "'!" & vbNewLine & "Kein eindeutiger Datensatz zu VKOPF_BESTELLNR Und VKOPF_EINGANSNR gefunden." & _
+                    MsgBox("Fehler beim Abschluss des Pakets '" & PAKET_ID & "#" & PAKET_GUID & "'!" & vbNewLine & "Kein eindeutiger Datensatz zu VKOPF_BESTELLNR Und VKOPF_EINGANSNR gefunden oder Adresse ist leer (Mercator Tabelle fehlerhaft)." &
                            vbNewLine & "Bitte verständigen Sie Ihren Systembetreuuer", MsgBoxStyle.Critical, "Fehler")
                     Return False
                 End If
@@ -190,7 +197,7 @@
         Else
             Dim DT As DataTable = MyDataset.VWKOMMCOLLI_UEBERSICHT
             For Each DR As DataRow In DT.Rows
-                DR.Item("Selected") = True
+                DR.Item("SELECTED") = True
             Next
         End If
 
@@ -205,7 +212,7 @@
         Else
             Dim DT As DataTable = MyDataset.VWKOMMCOLLI_UEBERSICHT
             For Each DR As DataRow In DT.Rows
-                DR.Item("Selected") = False
+                DR.Item("SELECTED") = False
             Next
         End If
 

SchaumKommiCollo/KommiCollo/frmMain.Designer.vb

@@ -69,6 +69,7 @@ Partial Class frmMain
         Me.TBKOMMCOLLI_PAKET_POSBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.TBKOMMCOLLI_PAKET_POSTableAdapter = New KommiCollo.MyDatasetTableAdapters.TBKOMMCOLLI_PAKET_POSTableAdapter()
         Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
+        Me.tslblConString = New System.Windows.Forms.ToolStripStatusLabel()
         Me.tsinfolabel = New System.Windows.Forms.ToolStripStatusLabel()
         Me.ToolStripStatusLabelVersion = New System.Windows.Forms.ToolStripStatusLabel()
         Me.pnlError = New System.Windows.Forms.Panel()
@@ -100,7 +101,7 @@ Partial Class frmMain
         Me.TabPage2 = New System.Windows.Forms.TabPage()
         Me.GroupBox1 = New System.Windows.Forms.GroupBox()
         Me.Button2 = New System.Windows.Forms.Button()
-        Me.ListBox1 = New System.Windows.Forms.ListBox()
+        Me.ListBoxFortras = New System.Windows.Forms.ListBox()
         Me.TBKOMMCOLLI_HINWEISBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.btnAddTextschlüssel = New System.Windows.Forms.Button()
         Me.Label8 = New System.Windows.Forms.Label()
@@ -306,7 +307,7 @@ Partial Class frmMain
         Me.pnlPaketadd.Controls.Add(Me.cmbAuswMandant)
         Me.pnlPaketadd.Controls.Add(Me.Label1)
         Me.pnlPaketadd.Font = New System.Drawing.Font("Segoe UI", 14.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.pnlPaketadd.Location = New System.Drawing.Point(16, 76)
+        Me.pnlPaketadd.Location = New System.Drawing.Point(6, 59)
         Me.pnlPaketadd.Name = "pnlPaketadd"
         Me.pnlPaketadd.Size = New System.Drawing.Size(699, 191)
         Me.pnlPaketadd.TabIndex = 3
@@ -539,13 +540,24 @@ Partial Class frmMain
         '
         'StatusStrip1
         '
-        Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsinfolabel, Me.ToolStripStatusLabelVersion})
+        Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblConString, Me.tsinfolabel, Me.ToolStripStatusLabelVersion})
         Me.StatusStrip1.Location = New System.Drawing.Point(0, 711)
         Me.StatusStrip1.Name = "StatusStrip1"
         Me.StatusStrip1.Size = New System.Drawing.Size(1209, 22)
         Me.StatusStrip1.TabIndex = 5
         Me.StatusStrip1.Text = "StatusStrip1"
         '
+        'tslblConString
+        '
+        Me.tslblConString.BorderSides = CType((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) _
+            Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) _
+            Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom), System.Windows.Forms.ToolStripStatusLabelBorderSides)
+        Me.tslblConString.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.tslblConString.ForeColor = System.Drawing.SystemColors.HotTrack
+        Me.tslblConString.Name = "tslblConString"
+        Me.tslblConString.Size = New System.Drawing.Size(51, 17)
+        Me.tslblConString.Text = "ConStr: "
+        '
         'tsinfolabel
         '
         Me.tsinfolabel.Image = Global.KommiCollo.My.Resources.Resources.A_1
@@ -651,8 +663,8 @@ Partial Class frmMain
         'Panel2
         '
         Me.Panel2.Controls.Add(Me.pnlHuP)
-        Me.Panel2.Controls.Add(Me.pnlPaketadd)
         Me.Panel2.Controls.Add(Me.pnlAddBarcodes)
+        Me.Panel2.Controls.Add(Me.pnlPaketadd)
         Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill
         Me.Panel2.Location = New System.Drawing.Point(135, 54)
         Me.Panel2.Name = "Panel2"
@@ -674,7 +686,7 @@ Partial Class frmMain
         Me.pnlHuP.Controls.Add(Me.btnSendungFertig)
         Me.pnlHuP.Controls.Add(Me.txtScanHUP)
         Me.pnlHuP.Controls.Add(Me.Label9)
-        Me.pnlHuP.Location = New System.Drawing.Point(25, 3)
+        Me.pnlHuP.Location = New System.Drawing.Point(3, 3)
         Me.pnlHuP.Name = "pnlHuP"
         Me.pnlHuP.Size = New System.Drawing.Size(1049, 553)
         Me.pnlHuP.TabIndex = 14
@@ -870,7 +882,7 @@ Partial Class frmMain
         'GroupBox1
         '
         Me.GroupBox1.Controls.Add(Me.Button2)
-        Me.GroupBox1.Controls.Add(Me.ListBox1)
+        Me.GroupBox1.Controls.Add(Me.ListBoxFortras)
         Me.GroupBox1.Controls.Add(Me.btnAddTextschlüssel)
         Me.GroupBox1.Controls.Add(Me.Label8)
         Me.GroupBox1.Controls.Add(Me.txtHinweistext)
@@ -898,18 +910,18 @@ Partial Class frmMain
         Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight
         Me.Button2.UseVisualStyleBackColor = True
         '
-        'ListBox1
+        'ListBoxFortras
         '
-        Me.ListBox1.DataSource = Me.TBKOMMCOLLI_HINWEISBindingSource
+        Me.ListBoxFortras.DataSource = Me.TBKOMMCOLLI_HINWEISBindingSource
-        Me.ListBox1.DisplayMember = "BEZEICHNUNG"
+        Me.ListBoxFortras.DisplayMember = "BEZEICHNUNG"
-        Me.ListBox1.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.ListBoxFortras.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.ListBox1.FormattingEnabled = True
+        Me.ListBoxFortras.FormattingEnabled = True
-        Me.ListBox1.ItemHeight = 17
+        Me.ListBoxFortras.ItemHeight = 17
-        Me.ListBox1.Location = New System.Drawing.Point(159, 80)
+        Me.ListBoxFortras.Location = New System.Drawing.Point(159, 80)
-        Me.ListBox1.Name = "ListBox1"
+        Me.ListBoxFortras.Name = "ListBoxFortras"
-        Me.ListBox1.Size = New System.Drawing.Size(614, 89)
+        Me.ListBoxFortras.Size = New System.Drawing.Size(614, 89)
-        Me.ListBox1.TabIndex = 3
+        Me.ListBoxFortras.TabIndex = 3
-        Me.ListBox1.ValueMember = "GUID"
+        Me.ListBoxFortras.ValueMember = "GUID"
         '
         'TBKOMMCOLLI_HINWEISBindingSource
         '
@@ -1227,7 +1239,7 @@ Partial Class frmMain
     Friend WithEvents txtHinweistext As System.Windows.Forms.TextBox
     Friend WithEvents cmbTextschlüssel As System.Windows.Forms.ComboBox
     Friend WithEvents Label7 As System.Windows.Forms.Label
-    Friend WithEvents ListBox1 As System.Windows.Forms.ListBox
+    Friend WithEvents ListBoxFortras As System.Windows.Forms.ListBox
     Friend WithEvents TBKOMMCOLLI_HINWEISBindingSource As System.Windows.Forms.BindingSource
     Friend WithEvents TBKOMMCOLLI_HINWEISTableAdapter As KommiCollo.MyDatasetTableAdapters.TBKOMMCOLLI_HINWEISTableAdapter
     Friend WithEvents Button2 As System.Windows.Forms.Button
@@ -1245,4 +1257,5 @@ Partial Class frmMain
     Friend WithEvents GridControlLHM As DevExpress.XtraGrid.GridControl
     Friend WithEvents GridViewLHM As DevExpress.XtraGrid.Views.Grid.GridView
     Friend WithEvents ToolStripStatusLabelVersion As ToolStripStatusLabel
+    Friend WithEvents tslblConString As ToolStripStatusLabel
 End Class

SchaumKommiCollo/KommiCollo/frmMain.vb

@@ -31,8 +31,16 @@ Public Class frmMain
             Application.Exit()
         End If
         Try
+            'If (System.Diagnostics.Debugger.IsAttached) = False Then
+            My.Settings.ConfigConnectionString = "Data Source=192.168.13.101;Initial Catalog=SCHAUM_IID;Persist Security Info=True;User ID=sa;Password=dd"
+                My.Settings.ConfigConnStringMercator = "Data Source=192.168.13.101;Initial Catalog=CP2DD;Persist Security Info=True;User ID=sa;Password=dd"
+                My.Settings.Save()
+            ' End If
+            tslblConString.Text = "Constrings: " & My.Settings.ConfigConnectionString.Replace("=sa;Password=dd", "XXX") & " # " & My.Settings.ConfigConnStringMercator.Replace("=sa;Password=dd", "XXX")
             Me.TBWH_MANDANTTableAdapter.Connection.ConnectionString = My.Settings.ConfigConnectionString
             Me.TBKOMMCOLLI_PAKET_KOPFTableAdapter.Connection.ConnectionString = My.Settings.ConfigConnectionString
+            Me.TBKOMMCOLLI_PAKET_POSTableAdapter.Connection.ConnectionString = My.Settings.ConfigConnectionString
+
             Me.TBKOMMCOLLI_TERMINARTTableAdapter.Connection.ConnectionString = My.Settings.ConfigConnectionString
             Me.TBKOMMCOLLI_SDGPOSITIONENTableAdapter.Connection.ConnectionString = My.Settings.ConfigConnectionString
             TBKOMMCOLLI_TEXTSCHLUESSELTableAdapter.Connection.ConnectionString = My.Settings.ConfigConnectionString
@@ -91,6 +99,7 @@ Public Class frmMain
             If cmbAuswMandant.SelectedValue = 0 Then
 
             Else
+
                 TBKOMMCOLLI_PAKET_POSTableAdapter.Insert(CURRENT_SENDUNG, BC)
                 TBKOMMCOLLI_PAKET_KOPFTableAdapter.Fill(MyDataset.TBKOMMCOLLI_PAKET_KOPF, CURRENT_SENDUNG)
                 Refresh_Barcodes()
@@ -101,7 +110,7 @@ Public Class frmMain
             If ex.Message.Contains("UNIQ_BARCODE_PER_POS") Then
                 ShowError("ACHTUNG der Barcode wurde bereits einmal eingescannt!")
             Else
-                ShowError("Fehler in AddBarcode: " & vbNewLine & ex.Message)
+                ShowError("Fehler in AddBarcode: " & vbNewLine & ex.Message & vbNewLine & My.Settings.ConfigConnectionString)
             End If
 
         End Try
@@ -173,10 +182,14 @@ Public Class frmMain
                     CURR_Str = MERC_LIEFSTR
                 End If
                 If CURR_LIEFADR <> MERC_LIEFADR1 Or CURR_PLZ <> MERC_LIEFPLZ Or CURR_Str <> MERC_LIEFSTR Or CURR_Ort <> MERC_LIEFORT Then
-                    MsgBox("ACHTUNG: " & vbNewLine & "Die Adressdaten sind unterschiedlich!", MsgBoxStyle.Exclamation)
+                    ' Fragen ob das Profil wirklich gelöscht werden soll
+                    Dim result As MsgBoxResult = MsgBox("Die Adressen sind unterschiedlich!" & vbNewLine & "Wollen Sie den Lieferschein dennoch hinzufügen?" & vbNewLine & "Wenn ja, dann kontrollieren Sie bitte die Adresse!", MsgBoxStyle.YesNo, "Bitte bestätigen:")
+                    ' wenn das Profil gelöscht werden soll
+                    If result = MsgBoxResult.No Then
+                        '    MsgBox("ACHTUNG: " & vbNewLine & "Die Adressdaten sind unterschiedlich!", MsgBoxStyle.Exclamation)
                         Return False
                     End If
-
+                End If
 
                 Dim Upd = String.Format("UPDATE TBKOMMCOLLI_SENDUNGEN SET KUNDEN_ID = '{0}',NAME1 = '{1}',NAME2 = '{2}',STRASSE = '{3}',LKZ = '{4}',PLZ = '{5}',ORT = '{6}' WHERE GUID = {7}", MERC_KDNR, MERC_LIEFADR1, MERC_LIEFADR2, MERC_LIEFSTR, MERC_LIEFLAND, MERC_LIEFPLZ, MERC_LIEFORT, CURRENT_SENDUNG)
                     If ClassDatabase.Execute_non_Query(Upd, True) = True Then
@@ -339,7 +352,7 @@ Public Class frmMain
             Dim I As Integer
             For I = 0 To ListViewBarcodes.SelectedItems.Count - 1
                 TBKOMMCOLLI_PAKET_POSTableAdapter.Delete(ListViewBarcodes.SelectedItems(I).Text)
-                tsinfolabel.Text = "Barcode erfogreich gelöscht"
+                tsinfolabel.Text = "Barcode erfolgreich gelöscht"
             Next
             TBKOMMCOLLI_PAKET_KOPFTableAdapter.Fill(MyDataset.TBKOMMCOLLI_PAKET_KOPF, CURRENT_SENDUNG)
             Refresh_Barcodes()
@@ -401,8 +414,9 @@ Public Class frmMain
             btnAddPaket.Enabled = True
             tsinfolabel.Text = "Vorgang abgebrochen"
             tsinfolabel.Visible = True
-            ListBox1.ResetText()
+            ListBoxFortras.ResetText()
             txtFreitext.Text = ""
+            txtHinweistext.Text = ""
         Catch ex As Exception
             ShowError("Fehler in Abbruch Paket: " & vbNewLine & ex.Message)
         End Try
@@ -619,7 +633,16 @@ Public Class frmMain
                     Exit Sub
                 End If
                 SDG_READY = True
+                If TabControl2.SelectedIndex = 0 Then
                     Refresh_POS(CURRENT_SENDUNG)
+                    btndeletePosLHM.Text = "Lösche Position/Lieferschein"
+                    btndeletePosLHM.Enabled = True
+                ElseIf TabControl2.SelectedIndex = 1 Then
+                    Refresh_LHM(CURRENT_SENDUNG)
+                    btndeletePosLHM.Text = "Lösche LHM"
+                    btndeletePosLHM.Enabled = False
+                End If
+
                 ' cmbLHM.Enabled = True
                 ' cmbLHM.DroppedDown = True
                 tsinfolabel.Visible = True
@@ -645,7 +668,7 @@ Public Class frmMain
                     btnAddPaket.Enabled = True
                     tsinfolabel.Text = "Vorgang abgebrochen"
                     tsinfolabel.Visible = True
-                    ListBox1.ResetText()
+                    ListBoxFortras.ResetText()
 
                     frmPrintOptions.ShowDialog()
                     GridControlLHM.DataSource = Nothing
@@ -805,6 +828,8 @@ Public Class frmMain
     Private Sub pnlHuP_VisibleChanged(sender As Object, e As EventArgs) Handles pnlHuP.VisibleChanged
         If pnlHuP.Visible = True Then
             txtFreitext.Text = ""
+            txtHinweistext.Text = ""
+            ListBoxFortras.ResetText()
         End If
     End Sub
 

SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.vbproj.FileListAbsolute.txt

@@ -952,8 +952,6 @@ E:\SchreiberM\Visual Studio\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debu
 E:\SchreiberM\Visual Studio\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.exe
 E:\SchreiberM\Visual Studio\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.xml
 E:\SchreiberM\Visual Studio\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.pdb
-E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.frmAbschluss.resources
-E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.frmLabel.resources
 E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\bin\Debug\Testreport.rdlc
 E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\bin\Debug\KommiCollo.exe.config
 E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\bin\Debug\KommiCollo.exe
@@ -1130,18 +1128,21 @@ E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\bin\Debu
 E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\bin\Debug\es\DevExpress.Pdf.v15.2.Core.resources.dll
 E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\bin\Debug\ja\DevExpress.Pdf.v15.2.Core.resources.dll
 E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\bin\Debug\ru\DevExpress.Pdf.v15.2.Core.resources.dll
-E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.vbprojResolveAssemblyReference.cache
 E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.DocumentViewerEx.resources
+E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.frmAbschluss.resources
 E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.frmAdressChange.resources
 E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.frmConnection.resources
+E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.frmLabel.resources
 E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.frmMain.resources
 E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.frmPrintOptions.resources
 E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.frmStammdatenverwaltung.resources
 E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.Resources.resources
+E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.reportHinweis.resources
 E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.reportUebergabe.resources
-E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.vbproj.GenerateResource.Cache
+E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.vbproj.GenerateResource.cache
 E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.exe.licenses
 E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.vbproj.CoreCompileInputs.cache
+E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.vbproj.CopyComplete
 E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.exe
 E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.xml
 E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\KommiCollo\obj\x86\Debug\KommiCollo.pdb

SchaumKommiCollo/KommiCollo/obj/x86/Debug/KommiCollo.xml

@@ -278,6 +278,11 @@ Represents the strongly named DataTable class.
 Represents the strongly named DataTable class.
 </summary>
 </member>
+<member name="T:KommiCollo.MyDataset.VWKOMMCOLLI_UEBERSICHTDataTable">
+<summary>
+Represents the strongly named DataTable class.
+</summary>
+</member>
 <member name="T:KommiCollo.MyDataset.TBKOMMCOLLI_MANDANTRow">
 <summary>
 Represents strongly named DataRow class.
@@ -333,6 +338,11 @@ Represents strongly named DataRow class.
 Represents strongly named DataRow class.
 </summary>
 </member>
+<member name="T:KommiCollo.MyDataset.VWKOMMCOLLI_UEBERSICHTRow">
+<summary>
+Represents strongly named DataRow class.
+</summary>
+</member>
 <member name="T:KommiCollo.MyDataset.TBKOMMCOLLI_MANDANTRowChangeEvent">
 <summary>
 Row event argument class
@@ -388,6 +398,11 @@ Row event argument class
 Row event argument class
 </summary>
 </member>
+<member name="T:KommiCollo.MyDataset.VWKOMMCOLLI_UEBERSICHTRowChangeEvent">
+<summary>
+Row event argument class
+</summary>
+</member>
 <member name="T:KommiCollo.MyDatasetTableAdapters.TBKOMMCOLLI_MANDANTTableAdapter">
 <summary>
 Represents the connection and commands used to retrieve and save data.
@@ -443,6 +458,11 @@ Represents the connection and commands used to retrieve and save data.
 Represents the connection and commands used to retrieve and save data.
 </summary>
 </member>
+<member name="T:KommiCollo.MyDatasetTableAdapters.VWKOMMCOLLI_UEBERSICHTTableAdapter">
+<summary>
+Represents the connection and commands used to retrieve and save data.
+</summary>
+</member>
 <member name="T:KommiCollo.MyDatasetTableAdapters.TableAdapterManager">
 <summary>
 TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios
@@ -483,5 +503,14 @@ Update Order Option
 Used to sort self-referenced table's rows
 </summary>
 </member>
+<member name="T:KommiCollo.reportUebergabe">
+ <summary>
+     Hier werden die Summen von
+         - Anzahl Sendungen
+         - Anzahl Kolli
+         - Gesamtgewicht
+     berechnet.
+ </summary>
+</member>
 </members>
 </doc>

SchaumKommiCollo/SetupWix/obj/Debug/SetupWix.wixproj.BindBuiltOutputsFileListde-DE.txt

@@ -1,2 +1,2 @@
-E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.1.0.0.msi
+E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.2.0.0.msi
-E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.1.0.0.wixpdb
+E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.2.0.0.wixpdb

SchaumKommiCollo/SetupWix/obj/Debug/SetupWix.wixproj.BindOutputsFileListde-DE.txt

@@ -1,2 +1,2 @@
-E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.1.0.0.msi
+E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.2.0.0.msi
-E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.1.0.0.wixpdb
+E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.2.0.0.wixpdb

SchaumKommiCollo/SetupWix/obj/Debug/SetupWix.wixproj.FileList.txt

@@ -2,9 +2,9 @@ E:\JenneJ\Visual Studio\SchaumKommi\SetupWix\bin\Debug\KommiCollo-x86-1.0.0.0.ms
 E:\JenneJ\Visual Studio\SchaumKommi\SetupWix\bin\Debug\KommiCollo-x86-1.0.0.0.wixpdb
 E:\SchreiberM\Visual Studio\GIT\SetupWix\bin\Debug\KommiCollo-x86-2.0.0.0.msi
 E:\SchreiberM\Visual Studio\GIT\SetupWix\bin\Debug\KommiCollo-x86-2.0.0.0.wixpdb
+E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.2.0.0.msi
+E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.2.0.0.wixpdb
 obj\Debug\Product.wixobj
 obj\Debug\SetupWix.wixproj.BindContentsFileListde-DE.txt
 obj\Debug\SetupWix.wixproj.BindOutputsFileListde-DE.txt
 obj\Debug\SetupWix.wixproj.BindBuiltOutputsFileListde-DE.txt
-E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.1.0.0.msi
-E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.1.0.0.wixpdb