diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_EU.Designer.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_EU.Designer.vb
index 2d45369e..8936cbb0 100644
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_EU.Designer.vb
+++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_EU.Designer.vb
@@ -85,6 +85,7 @@ Partial Class usrcntlVollmacht_MDM_EU
         Me.txt_GF_nachname = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txt_GF_vorname = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.cbxRMC = New System.Windows.Forms.CheckBox()
+        Me.cbxPrintDateAndCity = New System.Windows.Forms.CheckBox()
         CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
@@ -109,7 +110,7 @@ Partial Class usrcntlVollmacht_MDM_EU
         'Label7
         '
         Me.Label7.AutoSize = True
-        Me.Label7.Location = New System.Drawing.Point(590, 337)
+        Me.Label7.Location = New System.Drawing.Point(618, 340)
         Me.Label7.Name = "Label7"
         Me.Label7.Size = New System.Drawing.Size(24, 13)
         Me.Label7.TabIndex = 26
@@ -223,7 +224,7 @@ Partial Class usrcntlVollmacht_MDM_EU
         'Label13
         '
         Me.Label13.AutoSize = True
-        Me.Label13.Location = New System.Drawing.Point(812, 337)
+        Me.Label13.Location = New System.Drawing.Point(808, 340)
         Me.Label13.Name = "Label13"
         Me.Label13.Size = New System.Drawing.Size(41, 13)
         Me.Label13.TabIndex = 64
@@ -232,9 +233,9 @@ Partial Class usrcntlVollmacht_MDM_EU
         'datDatum
         '
         Me.datDatum.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
-        Me.datDatum.Location = New System.Drawing.Point(868, 337)
+        Me.datDatum.Location = New System.Drawing.Point(855, 337)
         Me.datDatum.Name = "datDatum"
-        Me.datDatum.Size = New System.Drawing.Size(95, 20)
+        Me.datDatum.Size = New System.Drawing.Size(108, 20)
         Me.datDatum.TabIndex = 65
         '
         'Label14
@@ -631,14 +632,13 @@ Partial Class usrcntlVollmacht_MDM_EU
         Me.txtOrt._value = Nothing
         Me.txtOrt._Waehrung = False
         Me.txtOrt._WaehrungZeichen = True
-        Me.txtOrt.Enabled = False
         Me.txtOrt.ForeColor = System.Drawing.Color.Black
-        Me.txtOrt.Location = New System.Drawing.Point(653, 334)
+        Me.txtOrt.Location = New System.Drawing.Point(653, 337)
         Me.txtOrt.MaxLineLength = -1
         Me.txtOrt.MaxLines_Warning = ""
         Me.txtOrt.MaxLines_Warning_Label = Nothing
         Me.txtOrt.Name = "txtOrt"
-        Me.txtOrt.Size = New System.Drawing.Size(109, 20)
+        Me.txtOrt.Size = New System.Drawing.Size(139, 20)
         Me.txtOrt.TabIndex = 27
         '
         'txtAdresse2
@@ -1044,12 +1044,24 @@ Partial Class usrcntlVollmacht_MDM_EU
         Me.cbxRMC.Text = "RMC"
         Me.cbxRMC.UseVisualStyleBackColor = True
         '
+        'cbxPrintDateAndCity
+        '
+        Me.cbxPrintDateAndCity.AutoSize = True
+        Me.cbxPrintDateAndCity.Checked = True
+        Me.cbxPrintDateAndCity.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxPrintDateAndCity.Location = New System.Drawing.Point(590, 340)
+        Me.cbxPrintDateAndCity.Name = "cbxPrintDateAndCity"
+        Me.cbxPrintDateAndCity.Size = New System.Drawing.Size(15, 14)
+        Me.cbxPrintDateAndCity.TabIndex = 148
+        Me.cbxPrintDateAndCity.UseVisualStyleBackColor = True
+        '
         'usrcntlVollmacht_MDM_EU
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.BackColor = System.Drawing.Color.WhiteSmoke
         Me.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Controls.Add(Me.cbxPrintDateAndCity)
         Me.Controls.Add(Me.cbxRMC)
         Me.Controls.Add(Me.CheckedListBox1)
         Me.Controls.Add(Me.cbx_GF_Geburtsland)
@@ -1183,4 +1195,5 @@ Partial Class usrcntlVollmacht_MDM_EU
     Friend WithEvents txt_GF_nachname As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents txt_GF_vorname As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents cbxRMC As CheckBox
+    Friend WithEvents cbxPrintDateAndCity As CheckBox
 End Class
diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_EU.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_EU.vb
index 8cb36257..14541e00 100644
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_EU.vb
+++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_EU.vb
@@ -106,6 +106,14 @@ Public Class usrcntlVollmacht_MDM_EU
         txtHRNr.Text = If(KUNDE_ERW.kde_HRNr, "")
         txtGruendungsdat.Text = If(KUNDE_ERW.kde_GruendungsDatum, "")
 
+        If txtAdresse3.Text <> "" Then
+            txtOrt.Text = txtAdresse3.Text
+        End If
+
+        If cboLand._value = "PL" Then
+            cbxPrintDateAndCity.Checked = False
+        End If
+
 
 
     End Sub
@@ -175,4 +183,15 @@ Public Class usrcntlVollmacht_MDM_EU
         ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
     End Sub
 
+    Private Sub cboLand_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboLand.SelectedIndexChanged
+        Select Case cboLand._value
+
+            Case "PL"
+
+        cbxPrintDateAndCity.Checked = False
+
+
+        End Select
+
+    End Sub
 End Class
diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_NICHT_EU.Designer.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_NICHT_EU.Designer.vb
index 3d99768c..9a451a0e 100644
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_NICHT_EU.Designer.vb
+++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_NICHT_EU.Designer.vb
@@ -82,7 +82,7 @@ Partial Class usrcntlVollmacht_MDM_NICHT_EU
         Me.Label19 = New System.Windows.Forms.Label()
         Me.cbxPrivatfirma = New System.Windows.Forms.CheckBox()
         Me.txt_GF_vorname = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.cbxPrintDate = New System.Windows.Forms.CheckBox()
+        Me.cbxPrintDateAndCity = New System.Windows.Forms.CheckBox()
         CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
@@ -285,15 +285,15 @@ Partial Class usrcntlVollmacht_MDM_NICHT_EU
         'datDatum
         '
         Me.datDatum.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
-        Me.datDatum.Location = New System.Drawing.Point(868, 309)
+        Me.datDatum.Location = New System.Drawing.Point(854, 309)
         Me.datDatum.Name = "datDatum"
-        Me.datDatum.Size = New System.Drawing.Size(95, 20)
+        Me.datDatum.Size = New System.Drawing.Size(109, 20)
         Me.datDatum.TabIndex = 108
         '
         'Label13
         '
         Me.Label13.AutoSize = True
-        Me.Label13.Location = New System.Drawing.Point(812, 309)
+        Me.Label13.Location = New System.Drawing.Point(798, 312)
         Me.Label13.Name = "Label13"
         Me.Label13.Size = New System.Drawing.Size(41, 13)
         Me.Label13.TabIndex = 107
@@ -302,7 +302,7 @@ Partial Class usrcntlVollmacht_MDM_NICHT_EU
         'Label7
         '
         Me.Label7.AutoSize = True
-        Me.Label7.Location = New System.Drawing.Point(590, 309)
+        Me.Label7.Location = New System.Drawing.Point(618, 312)
         Me.Label7.Name = "Label7"
         Me.Label7.Size = New System.Drawing.Size(24, 13)
         Me.Label7.TabIndex = 105
@@ -524,14 +524,13 @@ Partial Class usrcntlVollmacht_MDM_NICHT_EU
         Me.txtOrt._value = Nothing
         Me.txtOrt._Waehrung = False
         Me.txtOrt._WaehrungZeichen = True
-        Me.txtOrt.Enabled = False
         Me.txtOrt.ForeColor = System.Drawing.Color.Black
-        Me.txtOrt.Location = New System.Drawing.Point(653, 306)
+        Me.txtOrt.Location = New System.Drawing.Point(653, 309)
         Me.txtOrt.MaxLineLength = -1
         Me.txtOrt.MaxLines_Warning = ""
         Me.txtOrt.MaxLines_Warning_Label = Nothing
         Me.txtOrt.Name = "txtOrt"
-        Me.txtOrt.Size = New System.Drawing.Size(109, 20)
+        Me.txtOrt.Size = New System.Drawing.Size(123, 20)
         Me.txtOrt.TabIndex = 106
         '
         'txtEmailzurueck
@@ -1002,16 +1001,16 @@ Partial Class usrcntlVollmacht_MDM_NICHT_EU
         Me.txt_GF_vorname.Size = New System.Drawing.Size(163, 20)
         Me.txt_GF_vorname.TabIndex = 144
         '
-        'cbxPrintDate
+        'cbxPrintDateAndCity
         '
-        Me.cbxPrintDate.AutoSize = True
-        Me.cbxPrintDate.Checked = True
-        Me.cbxPrintDate.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.cbxPrintDate.Location = New System.Drawing.Point(969, 312)
-        Me.cbxPrintDate.Name = "cbxPrintDate"
-        Me.cbxPrintDate.Size = New System.Drawing.Size(15, 14)
-        Me.cbxPrintDate.TabIndex = 145
-        Me.cbxPrintDate.UseVisualStyleBackColor = True
+        Me.cbxPrintDateAndCity.AutoSize = True
+        Me.cbxPrintDateAndCity.Checked = True
+        Me.cbxPrintDateAndCity.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxPrintDateAndCity.Location = New System.Drawing.Point(590, 312)
+        Me.cbxPrintDateAndCity.Name = "cbxPrintDateAndCity"
+        Me.cbxPrintDateAndCity.Size = New System.Drawing.Size(15, 14)
+        Me.cbxPrintDateAndCity.TabIndex = 145
+        Me.cbxPrintDateAndCity.UseVisualStyleBackColor = True
         '
         'usrcntlVollmacht_MDM_NICHT_EU
         '
@@ -1019,7 +1018,7 @@ Partial Class usrcntlVollmacht_MDM_NICHT_EU
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.BackColor = System.Drawing.Color.WhiteSmoke
         Me.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.Controls.Add(Me.cbxPrintDate)
+        Me.Controls.Add(Me.cbxPrintDateAndCity)
         Me.Controls.Add(Me.cbxPrivatfirma)
         Me.Controls.Add(Me.cbx_GF_Geburtsland)
         Me.Controls.Add(Me.Label21)
@@ -1147,5 +1146,5 @@ Partial Class usrcntlVollmacht_MDM_NICHT_EU
     Friend WithEvents Label19 As Label
     Friend WithEvents cbxPrivatfirma As CheckBox
     Friend WithEvents txt_GF_vorname As VERAG_PROG_ALLGEMEIN.MyTextBox
-    Friend WithEvents cbxPrintDate As CheckBox
+    Friend WithEvents cbxPrintDateAndCity As CheckBox
 End Class
diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_NICHT_EU.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_NICHT_EU.vb
index cb76a616..7d0d876e 100644
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_NICHT_EU.vb
+++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_NICHT_EU.vb
@@ -98,6 +98,11 @@ Public Class usrcntlVollmacht_MDM_NICHT_EU
         txtHRNr.Text = If(KUNDE_ERW.kde_HRNr, "")
         txtGruendungsdat.Text = If(KUNDE_ERW.kde_GruendungsDatum, "")
 
+        If txtAdresse3.Text <> "" Then
+            txtOrt.Text = txtAdresse3.Text
+        End If
+
+
     End Sub
 
     Private Sub btnDel_Click(sender As Object, e As EventArgs) Handles btnDel.Click
@@ -174,6 +179,11 @@ Public Class usrcntlVollmacht_MDM_NICHT_EU
         Dim privatfirma As Boolean = False
         Select Case cboLand._value
 
+            Case "PL"
+
+                cbxPrintDateAndCity.Checked = False
+
+
             Case "NL"
                 privatfirma = True
             Case "HR"
diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb
index a50f64d7..b5eb974c 100644
--- a/SDL/Formulare/KDFormulare/frmFormulare.vb
+++ b/SDL/Formulare/KDFormulare/frmFormulare.vb
@@ -1786,9 +1786,9 @@ Public Class FormularManagerNEU
                         Case "ceo_surname" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_nachname.Text))
                         Case "ceo_firstname" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_vorname.Text))
 
-                        Case "place_date" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtOrt.Text & IIf(IsDate(usrCntl.datDatum.Text) AndAlso usrCntl.cbxPrintDate.Checked, usrCntl.datDatum.Text, "")))
-                        Case "place" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtOrt.Text))
-                        Case "date" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(IsDate(usrCntl.datDatum.Text) AndAlso usrCntl.cbxPrintDate.Checked, usrCntl.datDatum.Text, "")))
+                        Case "place_date" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtOrt.Text & IIf(IsDate(usrCntl.datDatum.Text) AndAlso usrCntl.cbxPrintDateAndCity.Checked, usrCntl.datDatum.Text, "")))
+                        Case "place" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(usrCntl.txtOrt.Text <> "" AndAlso usrCntl.cbxPrintDateAndCity.Checked, usrCntl.txtOrt.Text, "")))
+                        Case "date" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(IsDate(usrCntl.datDatum.Text) AndAlso usrCntl.cbxPrintDateAndCity.Checked, usrCntl.datDatum.Text, "")))
                         Case "capital" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtKapital.Text & " " & usrCntl.cbxKapitalWahrung._value))
                         Case "crnumber" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtHRNr.Text))
 
@@ -1808,9 +1808,9 @@ Public Class FormularManagerNEU
                         Case "c_kontonr" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, FIRMA.Firma_IBAN1.Replace("IBAN:", "").Replace(" ", "").ToString.Trim().Substring(13, 7)))
                         Case "c_blz" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, FIRMA.Firma_IBAN1.Replace("IBAN:", "").Replace(" ", "").ToString.Trim().Substring(3, 5)))
 
-                        Case "date_day" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(usrCntl.cbxPrintDate.Checked AndAlso IsDate(usrCntl.datDatum.Text), usrCntl.datDatum.Text.ToString.Substring(0, 2), "")))
-                        Case "date_month" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(usrCntl.cbxPrintDate.Checked AndAlso IsDate(usrCntl.datDatum.Text), usrCntl.datDatum.Text.ToString.Substring(3, 2), "")))
-                        Case "date_year" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(usrCntl.cbxPrintDate.Checked AndAlso IsDate(usrCntl.datDatum.Text), usrCntl.datDatum.Text.ToString.Substring(6, 4), "")))
+                        Case "date_day" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(usrCntl.cbxPrintDateAndCity.Checked AndAlso IsDate(usrCntl.datDatum.Text), usrCntl.datDatum.Text.ToString.Substring(0, 2), "")))
+                        Case "date_month" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(usrCntl.cbxPrintDateAndCity.Checked AndAlso IsDate(usrCntl.datDatum.Text), usrCntl.datDatum.Text.ToString.Substring(3, 2), "")))
+                        Case "date_year" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(usrCntl.cbxPrintDateAndCity.Checked AndAlso IsDate(usrCntl.datDatum.Text), usrCntl.datDatum.Text.ToString.Substring(6, 4), "")))
 
 
 
@@ -1819,7 +1819,7 @@ Public Class FormularManagerNEU
                 Else
 
                     Select Case item.Text.ToLower().Trim()
-                        Case "tagesdatum" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(IsDate(usrCntl.datDatum.Text) AndAlso usrCntl.cbxPrintDate.Checked, usrCntl.datDatum.Text, "")))
+                        Case "tagesdatum" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(IsDate(usrCntl.datDatum.Text) AndAlso usrCntl.cbxPrintDateAndCity.Checked, usrCntl.datDatum.Text, "")))
                     End Select
 
                 End If
@@ -1952,9 +1952,9 @@ Public Class FormularManagerNEU
                         Case "c_bic" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_BIC1.Replace("BIC:", "")
                         Case "c_bic1" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_BIC1.Replace("BIC:", "")
 
-                        Case "c_place_date" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtOrt.Text & ", " & IIf(IsDate(usrCntl.datDatum.Text) AndAlso usrCntl.cbxPrintDate.Checked, usrCntl.datDatum.Text, "")
-                        Case "c_date" : odoc.FormFields(fieldName).Range.Text = IIf(IsDate(usrCntl.datDatum.Text) AndAlso usrCntl.cbxPrintDate.Checked, usrCntl.datDatum.Text, "")
-                        Case "c_place" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtOrt.Text
+                        Case "c_place_date" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtOrt.Text & ", " & IIf(IsDate(usrCntl.datDatum.Text) AndAlso usrCntl.cbxPrintDateAndCity.Checked, usrCntl.datDatum.Text, "")
+                        Case "c_date" : odoc.FormFields(fieldName).Range.Text = IIf(IsDate(usrCntl.datDatum.Text) AndAlso usrCntl.cbxPrintDateAndCity.Checked, usrCntl.datDatum.Text, "")
+                        Case "c_place" : odoc.FormFields(fieldName).Range.Text = IIf(IsDate(usrCntl.txtOrt.Text) AndAlso usrCntl.cbxPrintDateAndCity.Checked, usrCntl.txtOrt.Text, "")
 
                     End Select
 
@@ -3865,7 +3865,7 @@ Public Class FormularManagerNEU
 
             ' Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "UID_Prüfung", listTowrite)
 
-            Dim PdfTmp = fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2_FO(MANDANT.Firma_Bez), "", "EORI_Prufung", listTowrite)
+            Dim PdfTmp = fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2_FO(MANDANT.Firmengruppe), "", "EORI_Prufung", listTowrite)
 
             Return PdfTmp
 
diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb
index 1a1f37c3..d2cacc4d 100644
--- a/SDL/USTV/frmMDM_USTVAntrag.vb
+++ b/SDL/USTV/frmMDM_USTVAntrag.vb
@@ -528,7 +528,7 @@ Public Class frmMDM_USTVAntrag
                         End If
 
                         If USTV_POS.INSERT() Then
-                            cMSEAPI.UPDATE_ARCHIV(USTV_POS.UStVPo_ReDat, r.Item("invoice_number"), kdNr)
+                            cMSEAPI.UPDATE_ARCHIV(r.Item("invoice_date"), r.Item("invoice_number"), kdNr, Antrag_LandKz)
                         End If
 
                     End If
diff --git a/SDL/UsrCntlEssensbestellungen.vb b/SDL/UsrCntlEssensbestellungen.vb
index f909094c..89c08c3f 100644
--- a/SDL/UsrCntlEssensbestellungen.vb
+++ b/SDL/UsrCntlEssensbestellungen.vb
@@ -676,7 +676,7 @@ Public Class UsrCntlessensbestellungen
 
         cbxGebäude.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Frontoffice", "Frontoffice"))
         cbxGebäude.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Suben West", "Suben West"))
-        cbxGebäude.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verag VERR", "Verag Verrechnung"))
+        cbxGebäude.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verag VERR", "Verag VERR"))
         cbxGebäude.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Maut", "Maut"))
         cbxGebäude.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
 
diff --git a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb
index 6397b6cd..1acd6430 100644
--- a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb
+++ b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb
@@ -23,19 +23,19 @@ Partial Class usrCntlKundenuebersicht
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
-        Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim 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 resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlKundenuebersicht))
-        Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.cntxtAddVM = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.DToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.btnExcel = New System.Windows.Forms.Button()
@@ -86,7 +86,6 @@ Partial Class usrCntlKundenuebersicht
         Me.txtVorauskasse = New System.Windows.Forms.TextBox()
         Me.lblAviso = New System.Windows.Forms.TextBox()
         Me.Label2 = New System.Windows.Forms.Label()
-        Me.UsrCntlKundenBesonderheiten1 = New SDL.usrCntlKundenBesonderheiten()
         Me.lblAbfertigungsverbot = New System.Windows.Forms.Label()
         Me.Label45 = New System.Windows.Forms.Label()
         Me.pnlVERAGSnspr = New System.Windows.Forms.Panel()
@@ -158,7 +157,6 @@ Partial Class usrCntlKundenuebersicht
         Me.PictureBox3 = New System.Windows.Forms.PictureBox()
         Me.PictureBox5 = New System.Windows.Forms.PictureBox()
         Me.tbKontaktSpez = New System.Windows.Forms.TabPage()
-        Me.ucKundenKontakte = New SDL.usrCntlKundenKontakte()
         Me.Label38 = New System.Windows.Forms.Label()
         Me.txtDebitorennr = New System.Windows.Forms.TextBox()
         Me.lblFwlFiskal = New System.Windows.Forms.LinkLabel()
@@ -206,7 +204,6 @@ Partial Class usrCntlKundenuebersicht
         Me.Button8 = New System.Windows.Forms.Button()
         Me.Button9 = New System.Windows.Forms.Button()
         Me.tbAvisoMail = New System.Windows.Forms.TabPage()
-        Me.UsrCntlKundenAvisoMailBenachrichtigung1 = New SDL.usrCntlKundenAvisoMailBenachrichtigung()
         Me.tbKdSpez = New System.Windows.Forms.TabPage()
         Me.Label14 = New System.Windows.Forms.Label()
         Me.Label43 = New System.Windows.Forms.Label()
@@ -232,12 +229,6 @@ Partial Class usrCntlKundenuebersicht
         Me.lblEORI = New System.Windows.Forms.TextBox()
         Me.lblEORINr = New System.Windows.Forms.Label()
         Me.dgvAufschub = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
-        Me.KtoId = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.Art = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.HZA = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.KontoNr = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.EORI = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.NL = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.KopierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip(Me.components)
@@ -262,6 +253,16 @@ Partial Class usrCntlKundenuebersicht
         Me.btnOP = New System.Windows.Forms.Button()
         Me.ContextMenuStrip5 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ToolStripMenuItem12 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.UsrCntlKundenBesonderheiten1 = New SDL.usrCntlKundenBesonderheiten()
+        Me.ucKundenKontakte = New SDL.usrCntlKundenKontakte()
+        Me.UsrCntlKundenAvisoMailBenachrichtigung1 = New SDL.usrCntlKundenAvisoMailBenachrichtigung()
+        Me.KtoId = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.Art = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.HZA = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.KontoNr = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.EORI = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.NL = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.BIN = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.cntxtAddVM.SuspendLayout()
         Me.tbWeitereKundenDetails.SuspendLayout()
         Me.tbOfferten.SuspendLayout()
@@ -424,8 +425,8 @@ Partial Class usrCntlKundenuebersicht
         Me.dgvOfferteDetailsUebersicht.AllowUserToDeleteRows = False
         Me.dgvOfferteDetailsUebersicht.AllowUserToOrderColumns = True
         Me.dgvOfferteDetailsUebersicht.AllowUserToResizeRows = False
-        DataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle13
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
         Me.dgvOfferteDetailsUebersicht.BackgroundColor = System.Drawing.Color.White
         Me.dgvOfferteDetailsUebersicht.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
         Me.dgvOfferteDetailsUebersicht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
@@ -445,8 +446,8 @@ Partial Class usrCntlKundenuebersicht
         Me.dgvOffertenSperrliste.AllowUserToDeleteRows = False
         Me.dgvOffertenSperrliste.AllowUserToOrderColumns = True
         Me.dgvOffertenSperrliste.AllowUserToResizeRows = False
-        DataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvOffertenSperrliste.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvOffertenSperrliste.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
         Me.dgvOffertenSperrliste.BackgroundColor = System.Drawing.Color.White
         Me.dgvOffertenSperrliste.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
         Me.dgvOffertenSperrliste.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
@@ -456,10 +457,10 @@ Partial Class usrCntlKundenuebersicht
         Me.dgvOffertenSperrliste.Name = "dgvOffertenSperrliste"
         Me.dgvOffertenSperrliste.ReadOnly = True
         Me.dgvOffertenSperrliste.RowHeadersVisible = False
-        DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle15.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer))
-        DataGridViewCellStyle15.SelectionForeColor = System.Drawing.Color.Black
-        Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle15
+        DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer))
+        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.Black
+        Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle3
         Me.dgvOffertenSperrliste.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
         Me.dgvOffertenSperrliste.Size = New System.Drawing.Size(173, 257)
         Me.dgvOffertenSperrliste.TabIndex = 0
@@ -597,8 +598,8 @@ Partial Class usrCntlKundenuebersicht
         Me.dgvOffenePosten.AllowUserToAddRows = False
         Me.dgvOffenePosten.AllowUserToDeleteRows = False
         Me.dgvOffenePosten.AllowUserToResizeRows = False
-        DataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle16
+        DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
         Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White
         Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvOffenePosten.Dock = System.Windows.Forms.DockStyle.Fill
@@ -678,8 +679,8 @@ Partial Class usrCntlKundenuebersicht
         Me.dgvUmsatzbericht.AllowUserToDeleteRows = False
         Me.dgvUmsatzbericht.AllowUserToOrderColumns = True
         Me.dgvUmsatzbericht.AllowUserToResizeRows = False
-        DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17
+        DataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5
         Me.dgvUmsatzbericht.BackgroundColor = System.Drawing.Color.White
         Me.dgvUmsatzbericht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvUmsatzbericht.Dock = System.Windows.Forms.DockStyle.Fill
@@ -741,8 +742,8 @@ Partial Class usrCntlKundenuebersicht
         Me.dgvAnhaenge.AllowUserToAddRows = False
         Me.dgvAnhaenge.AllowUserToDeleteRows = False
         Me.dgvAnhaenge.AllowUserToResizeRows = False
-        DataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvAnhaenge.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle18
+        DataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvAnhaenge.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6
         Me.dgvAnhaenge.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White
         Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
@@ -1034,17 +1035,6 @@ Partial Class usrCntlKundenuebersicht
         Me.Label2.Text = "Aviso:"
         Me.Label2.Visible = False
         '
-        'UsrCntlKundenBesonderheiten1
-        '
-        Me.UsrCntlKundenBesonderheiten1.AutoScroll = True
-        Me.UsrCntlKundenBesonderheiten1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlKundenBesonderheiten1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.UsrCntlKundenBesonderheiten1.Location = New System.Drawing.Point(7, 32)
-        Me.UsrCntlKundenBesonderheiten1.Name = "UsrCntlKundenBesonderheiten1"
-        Me.UsrCntlKundenBesonderheiten1.Size = New System.Drawing.Size(107, 52)
-        Me.UsrCntlKundenBesonderheiten1.TabIndex = 6
-        Me.UsrCntlKundenBesonderheiten1.Visible = False
-        '
         'lblAbfertigungsverbot
         '
         Me.lblAbfertigungsverbot.BackColor = System.Drawing.Color.Red
@@ -2195,14 +2185,6 @@ Partial Class usrCntlKundenuebersicht
         Me.tbKontaktSpez.Text = "Spezifisch"
         Me.tbKontaktSpez.UseVisualStyleBackColor = True
         '
-        'ucKundenKontakte
-        '
-        Me.ucKundenKontakte.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.ucKundenKontakte.Location = New System.Drawing.Point(3, 3)
-        Me.ucKundenKontakte.Name = "ucKundenKontakte"
-        Me.ucKundenKontakte.Size = New System.Drawing.Size(473, 158)
-        Me.ucKundenKontakte.TabIndex = 0
-        '
         'Label38
         '
         Me.Label38.AutoSize = True
@@ -2486,8 +2468,8 @@ Partial Class usrCntlKundenuebersicht
         Me.dgvVollmachten.AllowUserToDeleteRows = False
         Me.dgvVollmachten.AllowUserToOrderColumns = True
         Me.dgvVollmachten.AllowUserToResizeRows = False
-        DataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvVollmachten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle19
+        DataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvVollmachten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7
         Me.dgvVollmachten.BackgroundColor = System.Drawing.Color.White
         Me.dgvVollmachten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvVollmachten.Dock = System.Windows.Forms.DockStyle.Fill
@@ -2540,8 +2522,8 @@ Partial Class usrCntlKundenuebersicht
         Me.dgvVertraege.AllowUserToDeleteRows = False
         Me.dgvVertraege.AllowUserToOrderColumns = True
         Me.dgvVertraege.AllowUserToResizeRows = False
-        DataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvVertraege.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle20
+        DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvVertraege.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8
         Me.dgvVertraege.BackgroundColor = System.Drawing.Color.White
         Me.dgvVertraege.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvVertraege.Dock = System.Windows.Forms.DockStyle.Fill
@@ -2716,8 +2698,8 @@ Partial Class usrCntlKundenuebersicht
         Me.dgvGestGarantie.AllowUserToDeleteRows = False
         Me.dgvGestGarantie.AllowUserToOrderColumns = True
         Me.dgvGestGarantie.AllowUserToResizeRows = False
-        DataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvGestGarantie.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle21
+        DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvGestGarantie.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
         Me.dgvGestGarantie.BackgroundColor = System.Drawing.Color.White
         Me.dgvGestGarantie.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvGestGarantie.Dock = System.Windows.Forms.DockStyle.Fill
@@ -2853,16 +2835,6 @@ Partial Class usrCntlKundenuebersicht
         Me.tbAvisoMail.Text = "Aviso E-Mails"
         Me.tbAvisoMail.UseVisualStyleBackColor = True
         '
-        'UsrCntlKundenAvisoMailBenachrichtigung1
-        '
-        Me.UsrCntlKundenAvisoMailBenachrichtigung1.AutoScroll = True
-        Me.UsrCntlKundenAvisoMailBenachrichtigung1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlKundenAvisoMailBenachrichtigung1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrCntlKundenAvisoMailBenachrichtigung1.Location = New System.Drawing.Point(3, 3)
-        Me.UsrCntlKundenAvisoMailBenachrichtigung1.Name = "UsrCntlKundenAvisoMailBenachrichtigung1"
-        Me.UsrCntlKundenAvisoMailBenachrichtigung1.Size = New System.Drawing.Size(473, 158)
-        Me.UsrCntlKundenAvisoMailBenachrichtigung1.TabIndex = 0
-        '
         'tbKdSpez
         '
         Me.tbKdSpez.Controls.Add(Me.Label14)
@@ -3171,24 +3143,24 @@ Partial Class usrCntlKundenuebersicht
         Me.dgvAufschub.AllowUserToResizeColumns = False
         Me.dgvAufschub.AllowUserToResizeRows = False
         Me.dgvAufschub.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvAufschub.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle22
+        DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 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.dgvAufschub.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle10
         Me.dgvAufschub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.dgvAufschub.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.KtoId, Me.Art, Me.HZA, Me.KontoNr, Me.EORI, Me.NL})
-        DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvAufschub.DefaultCellStyle = DataGridViewCellStyle24
+        Me.dgvAufschub.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.KtoId, Me.Art, Me.HZA, Me.KontoNr, Me.EORI, Me.NL, Me.BIN})
+        DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window
+        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.ControlText
+        DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvAufschub.DefaultCellStyle = DataGridViewCellStyle12
         Me.dgvAufschub.Location = New System.Drawing.Point(13, 61)
         Me.dgvAufschub.MultiSelect = False
         Me.dgvAufschub.Name = "dgvAufschub"
@@ -3199,51 +3171,6 @@ Partial Class usrCntlKundenuebersicht
         Me.dgvAufschub.TabIndex = 11
         Me.dgvAufschub.TabStop = False
         '
-        'KtoId
-        '
-        Me.KtoId.HeaderText = "Id"
-        Me.KtoId.Name = "KtoId"
-        Me.KtoId.ReadOnly = True
-        Me.KtoId.Visible = False
-        '
-        'Art
-        '
-        Me.Art.HeaderText = "Aufschub"
-        Me.Art.Name = "Art"
-        Me.Art.ReadOnly = True
-        Me.Art.Width = 120
-        '
-        'HZA
-        '
-        DataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
-        Me.HZA.DefaultCellStyle = DataGridViewCellStyle23
-        Me.HZA.HeaderText = "HZA"
-        Me.HZA.Name = "HZA"
-        Me.HZA.ReadOnly = True
-        Me.HZA.Width = 35
-        '
-        'KontoNr
-        '
-        Me.KontoNr.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None
-        Me.KontoNr.HeaderText = "Konto Nr."
-        Me.KontoNr.Name = "KontoNr"
-        Me.KontoNr.ReadOnly = True
-        Me.KontoNr.Resizable = System.Windows.Forms.DataGridViewTriState.[True]
-        '
-        'EORI
-        '
-        Me.EORI.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
-        Me.EORI.HeaderText = "EORI"
-        Me.EORI.Name = "EORI"
-        Me.EORI.ReadOnly = True
-        '
-        'NL
-        '
-        Me.NL.HeaderText = "NL"
-        Me.NL.Name = "NL"
-        Me.NL.ReadOnly = True
-        Me.NL.Width = 60
-        '
         'ContextMenuStrip1
         '
         Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KopierenToolStripMenuItem})
@@ -3418,15 +3345,96 @@ Partial Class usrCntlKundenuebersicht
         Me.ContextMenuStrip5.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.ContextMenuStrip5.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem12})
         Me.ContextMenuStrip5.Name = "ContextMenuStrip1"
-        Me.ContextMenuStrip5.Size = New System.Drawing.Size(189, 56)
+        Me.ContextMenuStrip5.Size = New System.Drawing.Size(151, 34)
         '
         'ToolStripMenuItem12
         '
         Me.ToolStripMenuItem12.Image = Global.SDL.My.Resources.Resources.printer21
         Me.ToolStripMenuItem12.Name = "ToolStripMenuItem12"
-        Me.ToolStripMenuItem12.Size = New System.Drawing.Size(188, 30)
+        Me.ToolStripMenuItem12.Size = New System.Drawing.Size(150, 30)
         Me.ToolStripMenuItem12.Text = "Schnelldruck"
         '
+        'UsrCntlKundenBesonderheiten1
+        '
+        Me.UsrCntlKundenBesonderheiten1.AutoScroll = True
+        Me.UsrCntlKundenBesonderheiten1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlKundenBesonderheiten1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.UsrCntlKundenBesonderheiten1.Location = New System.Drawing.Point(7, 32)
+        Me.UsrCntlKundenBesonderheiten1.Name = "UsrCntlKundenBesonderheiten1"
+        Me.UsrCntlKundenBesonderheiten1.Size = New System.Drawing.Size(107, 52)
+        Me.UsrCntlKundenBesonderheiten1.TabIndex = 6
+        Me.UsrCntlKundenBesonderheiten1.Visible = False
+        '
+        'ucKundenKontakte
+        '
+        Me.ucKundenKontakte.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.ucKundenKontakte.Location = New System.Drawing.Point(3, 3)
+        Me.ucKundenKontakte.Name = "ucKundenKontakte"
+        Me.ucKundenKontakte.Size = New System.Drawing.Size(473, 158)
+        Me.ucKundenKontakte.TabIndex = 0
+        '
+        'UsrCntlKundenAvisoMailBenachrichtigung1
+        '
+        Me.UsrCntlKundenAvisoMailBenachrichtigung1.AutoScroll = True
+        Me.UsrCntlKundenAvisoMailBenachrichtigung1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlKundenAvisoMailBenachrichtigung1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrCntlKundenAvisoMailBenachrichtigung1.Location = New System.Drawing.Point(3, 3)
+        Me.UsrCntlKundenAvisoMailBenachrichtigung1.Name = "UsrCntlKundenAvisoMailBenachrichtigung1"
+        Me.UsrCntlKundenAvisoMailBenachrichtigung1.Size = New System.Drawing.Size(473, 158)
+        Me.UsrCntlKundenAvisoMailBenachrichtigung1.TabIndex = 0
+        '
+        'KtoId
+        '
+        Me.KtoId.HeaderText = "Id"
+        Me.KtoId.Name = "KtoId"
+        Me.KtoId.ReadOnly = True
+        Me.KtoId.Visible = False
+        '
+        'Art
+        '
+        Me.Art.HeaderText = "Aufschub"
+        Me.Art.Name = "Art"
+        Me.Art.ReadOnly = True
+        Me.Art.Width = 120
+        '
+        'HZA
+        '
+        DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
+        Me.HZA.DefaultCellStyle = DataGridViewCellStyle11
+        Me.HZA.HeaderText = "HZA"
+        Me.HZA.Name = "HZA"
+        Me.HZA.ReadOnly = True
+        Me.HZA.Width = 35
+        '
+        'KontoNr
+        '
+        Me.KontoNr.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None
+        Me.KontoNr.HeaderText = "Konto Nr."
+        Me.KontoNr.Name = "KontoNr"
+        Me.KontoNr.ReadOnly = True
+        Me.KontoNr.Resizable = System.Windows.Forms.DataGridViewTriState.[True]
+        '
+        'EORI
+        '
+        Me.EORI.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
+        Me.EORI.HeaderText = "EORI"
+        Me.EORI.Name = "EORI"
+        Me.EORI.ReadOnly = True
+        '
+        'NL
+        '
+        Me.NL.HeaderText = "NL"
+        Me.NL.Name = "NL"
+        Me.NL.ReadOnly = True
+        Me.NL.Width = 60
+        '
+        'BIN
+        '
+        Me.BIN.HeaderText = "BIN"
+        Me.BIN.Name = "BIN"
+        Me.BIN.ReadOnly = True
+        Me.BIN.Visible = False
+        '
         'usrCntlKundenuebersicht
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -3675,12 +3683,6 @@ Partial Class usrCntlKundenuebersicht
     Friend WithEvents lblEORI As TextBox
     Friend WithEvents lblEORINr As Label
     Friend WithEvents dgvAufschub As VERAG_PROG_ALLGEMEIN.MyDatagridview
-    Friend WithEvents KtoId As DataGridViewTextBoxColumn
-    Friend WithEvents Art As DataGridViewTextBoxColumn
-    Friend WithEvents HZA As DataGridViewTextBoxColumn
-    Friend WithEvents KontoNr As DataGridViewTextBoxColumn
-    Friend WithEvents EORI As DataGridViewTextBoxColumn
-    Friend WithEvents NL As DataGridViewTextBoxColumn
     Friend WithEvents rtbInfo As RichTextBox
     Friend WithEvents lblAbfertigungsverbot As Label
     Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
@@ -3747,4 +3749,11 @@ Partial Class usrCntlKundenuebersicht
     Friend WithEvents btnOP As Button
     Friend WithEvents ContextMenuStrip5 As ContextMenuStrip
     Friend WithEvents ToolStripMenuItem12 As ToolStripMenuItem
+    Friend WithEvents KtoId As DataGridViewTextBoxColumn
+    Friend WithEvents Art As DataGridViewTextBoxColumn
+    Friend WithEvents HZA As DataGridViewTextBoxColumn
+    Friend WithEvents KontoNr As DataGridViewTextBoxColumn
+    Friend WithEvents EORI As DataGridViewTextBoxColumn
+    Friend WithEvents NL As DataGridViewTextBoxColumn
+    Friend WithEvents BIN As DataGridViewTextBoxColumn
 End Class
diff --git a/SDL/kunden/usrCntlKundenuebersicht.resx b/SDL/kunden/usrCntlKundenuebersicht.resx
index 0b9f2d05..99bb42bd 100644
--- a/SDL/kunden/usrCntlKundenuebersicht.resx
+++ b/SDL/kunden/usrCntlKundenuebersicht.resx
@@ -227,6 +227,9 @@
   <metadata name="NL.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="BIN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>832, 17</value>
   </metadata>
diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb
index 403e92c3..e8976ba1 100644
--- a/SDL/kunden/usrCntlKundenuebersicht.vb
+++ b/SDL/kunden/usrCntlKundenuebersicht.vb
@@ -1571,17 +1571,20 @@ Public Class usrCntlKundenuebersicht
     Public Sub initAufschub()
         '  AUFSCHUB = VERAG_PROG_ALLGEMEIN.cKundenAufschubkonten.LOAD_ListAufschubKTOByKdNr(kdNr)
         dgvAufschub.Rows.Clear()
+
         If AUFSCHUB IsNot Nothing Then
-            For Each AB In AUFSCHUB
-                Dim art = ""
-                Select Case AB.kdAkto_art
-                    Case "10" : art = "10 - ZOLL/EUST"
-                    Case "15" : art = "15 - ZOLL"
-                    Case "20" : art = "20 - EUST"
-                End Select
-                dgvAufschub.Rows.Add(AB.kdAkto_id, art, AB.kdAkto_hauptzollamt, AB.kdAkto_kontonummer, AB.kdAkto_eori, AB.kdAkto_eoriNL, AB.kdAkto_bin)
-            Next
-        End If
+                For Each AB In AUFSCHUB
+                    Dim art = ""
+                    Select Case AB.kdAkto_art
+                        Case "10" : art = "10 - ZOLL/EUST"
+                        Case "15" : art = "15 - ZOLL"
+                        Case "20" : art = "20 - EUST"
+                    End Select
+                    dgvAufschub.Rows.Add(AB.kdAkto_id, art, AB.kdAkto_hauptzollamt, AB.kdAkto_kontonummer, AB.kdAkto_eori, AB.kdAkto_eoriNL, AB.kdAkto_bin)
+                Next
+            End If
+
+
         dgvAufschub.ClearSelection()
     End Sub
 
diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb
index 44f34a23..972a25f0 100644
--- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb
+++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb
@@ -23,25 +23,25 @@ Partial Class usrcntlKundeBearbeitenFull
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
-        Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle31 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle32 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle33 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle34 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle35 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle36 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle37 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle38 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.tbcntrDetails = New System.Windows.Forms.TabControl()
         Me.tbAbfertigung = New System.Windows.Forms.TabPage()
         Me.cbxVerzolltBeiExport = New System.Windows.Forms.CheckBox()
@@ -2839,8 +2839,8 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.dgvUmsatzbericht.AllowUserToDeleteRows = False
         Me.dgvUmsatzbericht.AllowUserToOrderColumns = True
         Me.dgvUmsatzbericht.AllowUserToResizeRows = False
-        DataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle20
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
         Me.dgvUmsatzbericht.BackgroundColor = System.Drawing.Color.White
         Me.dgvUmsatzbericht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvUmsatzbericht.Location = New System.Drawing.Point(6, 25)
@@ -2939,8 +2939,8 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.dgvOffenePosten.AllowUserToDeleteRows = False
         Me.dgvOffenePosten.AllowUserToOrderColumns = True
         Me.dgvOffenePosten.AllowUserToResizeRows = False
-        DataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle21
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
         Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White
         Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvOffenePosten.Location = New System.Drawing.Point(6, 38)
@@ -3101,41 +3101,41 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.dgvKreditkarten.AllowUserToDeleteRows = False
         Me.dgvKreditkarten.AllowUserToOrderColumns = True
         Me.dgvKreditkarten.AllowUserToResizeRows = False
-        DataGridViewCellStyle22.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle22
+        DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
         Me.dgvKreditkarten.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle23
+        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.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4
         Me.dgvKreditkarten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle24
+        DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window
+        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.ControlText
+        DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle5
         Me.dgvKreditkarten.Location = New System.Drawing.Point(9, 20)
         Me.dgvKreditkarten.MultiSelect = False
         Me.dgvKreditkarten.Name = "dgvKreditkarten"
         Me.dgvKreditkarten.ReadOnly = True
-        DataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle25
+        DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle6
         Me.dgvKreditkarten.RowHeadersVisible = False
-        DataGridViewCellStyle26.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle26
+        DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle7
         Me.dgvKreditkarten.RowTemplate.DefaultCellStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.dgvKreditkarten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
         Me.dgvKreditkarten.Size = New System.Drawing.Size(642, 312)
@@ -3274,26 +3274,26 @@ Partial Class usrcntlKundeBearbeitenFull
         '
         'dgvUstv_LaenderUndSteuernummern
         '
-        DataGridViewCellStyle27.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle27
+        DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8
         Me.dgvUstv_LaenderUndSteuernummern.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle28.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle28
+        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.dgvUstv_LaenderUndSteuernummern.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle9
         Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle29.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvUstv_LaenderUndSteuernummern.DefaultCellStyle = DataGridViewCellStyle29
+        DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvUstv_LaenderUndSteuernummern.DefaultCellStyle = DataGridViewCellStyle10
         Me.dgvUstv_LaenderUndSteuernummern.Location = New System.Drawing.Point(9, 94)
         Me.dgvUstv_LaenderUndSteuernummern.Name = "dgvUstv_LaenderUndSteuernummern"
         Me.dgvUstv_LaenderUndSteuernummern.Size = New System.Drawing.Size(657, 321)
@@ -3530,26 +3530,26 @@ Partial Class usrcntlKundeBearbeitenFull
         'dgvSonst_IDSKunden
         '
         Me.dgvSonst_IDSKunden.AllowUserToResizeRows = False
-        DataGridViewCellStyle30.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle30
+        DataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11
         Me.dgvSonst_IDSKunden.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle31.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvSonst_IDSKunden.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle31
+        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.dgvSonst_IDSKunden.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle12
         Me.dgvSonst_IDSKunden.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle32.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle32.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle32.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle32.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle32.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvSonst_IDSKunden.DefaultCellStyle = DataGridViewCellStyle32
+        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.dgvSonst_IDSKunden.DefaultCellStyle = DataGridViewCellStyle13
         Me.dgvSonst_IDSKunden.Location = New System.Drawing.Point(9, 251)
         Me.dgvSonst_IDSKunden.MultiSelect = False
         Me.dgvSonst_IDSKunden.Name = "dgvSonst_IDSKunden"
@@ -3766,26 +3766,26 @@ Partial Class usrcntlKundeBearbeitenFull
         'DataGridView1
         '
         Me.DataGridView1.AllowUserToResizeRows = False
-        DataGridViewCellStyle33.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle33
+        DataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14
         Me.DataGridView1.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle34.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle34.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle34.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle34.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle34.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.DataGridView1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle34
+        DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.DataGridView1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle15
         Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle35.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle35.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle35.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle35.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle35.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.DataGridView1.DefaultCellStyle = DataGridViewCellStyle35
+        DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.DataGridView1.DefaultCellStyle = DataGridViewCellStyle16
         Me.DataGridView1.Enabled = False
         Me.DataGridView1.Location = New System.Drawing.Point(6, 111)
         Me.DataGridView1.MultiSelect = False
@@ -3839,26 +3839,26 @@ Partial Class usrcntlKundeBearbeitenFull
         '
         Me.dgvBankverbindungen.AllowUserToDeleteRows = False
         Me.dgvBankverbindungen.AllowUserToResizeRows = False
-        DataGridViewCellStyle36.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvBankverbindungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle36
+        DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvBankverbindungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17
         Me.dgvBankverbindungen.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle37.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle37.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle37.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle37.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle37.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle37.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvBankverbindungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle37
+        DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control
+        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.WindowText
+        DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvBankverbindungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle18
         Me.dgvBankverbindungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle38.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle38.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle38.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle38.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle38.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle38.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvBankverbindungen.DefaultCellStyle = DataGridViewCellStyle38
+        DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Window
+        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.ControlText
+        DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvBankverbindungen.DefaultCellStyle = DataGridViewCellStyle19
         Me.dgvBankverbindungen.Location = New System.Drawing.Point(3, 40)
         Me.dgvBankverbindungen.MultiSelect = False
         Me.dgvBankverbindungen.Name = "dgvBankverbindungen"
@@ -4943,7 +4943,7 @@ Partial Class usrcntlKundeBearbeitenFull
         '
         Me.cnsBankverbindungen.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ArchivierenToolStripMenuItem, Me.DokumentHinzufügenToolStripMenuItem, Me.DokumentLöschenToolStripMenuItem})
         Me.cnsBankverbindungen.Name = "cnsBankverbindungen"
-        Me.cnsBankverbindungen.Size = New System.Drawing.Size(194, 92)
+        Me.cnsBankverbindungen.Size = New System.Drawing.Size(194, 70)
         '
         'ArchivierenToolStripMenuItem
         '
diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb
index 0837fd7e..a49cf83f 100644
--- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb
+++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb
@@ -1615,6 +1615,33 @@ Public Class usrcntlKundeBearbeitenFull
                     frmList.Show(Me)
                 End If
             Case "EORI"
+
+                Dim dt = sql.loadDgvBySql("SELECT [eori_id],[eori_KdNr] KundenNr,[eori_Datum]Datum,[eori_valid]Gültig,[eori_sachbearbeiter]Sachbearbeiter FROM [tblEORIPruefung] where eori_KdNr='" & kdNr & "' ORDER BY eori_Datum desc", "FMZOLL")
+                If dt IsNot Nothing Then
+                    frmList.dgv.DataSource = dt
+                    frmList.dgv.Columns("eori_id").Visible = False
+
+                    '--------------------------
+                    AddHandler frmList.dgv.CellDoubleClick, Sub()
+                                                                Dim eoripruef As New cEORIPruefung(frmList.dgv.SelectedRows(0).Cells("eori_id").Value)
+                                                                Dim msgErgebnis
+                                                                If eoripruef.eori_valid Then
+                                                                    msgErgebnis = "EORI-Nr. GÜLTIG   -   OK"
+                                                                Else
+                                                                    msgErgebnis = "EORI-Nr. UNGÜLTIG"
+                                                                End If
+
+                                                                Dim PdfTmp = SDL.FormularManagerNEU.EORI_PRUEFUNG(msgErgebnis, eoripruef.eori_firma, eoripruef.eori_sessionID, KUNDE.EORITIN,, eoripruef.eori_sendungsid, eoripruef.eori_datum, eoripruef.eori_sachbearbeiter, eoripruef.eori_FirmaID)
+                                                                If PdfTmp <> "" Then
+                                                                    Process.Start(PdfTmp)
+
+                                                                End If
+                                                            End Sub
+                    '--------------------------
+
+                    frmList.Show(Me)
+                End If
+
         End Select
 
 
@@ -1896,7 +1923,7 @@ Public Class usrcntlKundeBearbeitenFull
     Sub initdgvBankverbindungen(bearbeiten As Boolean, Optional archivierteDSAnzeigen As Boolean = False)
         With dgvBankverbindungen
 
-            cBinding_dgvBankverbindungen.initBinding(" SELECT [bnk_id],[bnk_KundenNr],[bnk_iban],[bnk_bic],[bnk_name],[bnk_adresse],[bnk_daid],[bnk_hauptkonto],[bnk_archiv],cast([bnk_Datum] as Date) as bnk_Datum " &
+            cBinding_dgvBankverbindungen.initBinding(" SELECT [bnk_id],[bnk_KundenNr],[bnk_iban],[bnk_bic],[bnk_anschrift],[bnk_daid],[bnk_hauptkonto],[bnk_archiv],cast([bnk_Datum] as Date) as bnk_Datum " &
                                                " FROM tblBankverbindungen " &
                                                " WHERE bnk_KundenNr = '" & KUNDE.KundenNr & "'" & IIf(Not archivierteDSAnzeigen, " AND ISNULL(bnk_archiv,0) = 0", ""), "tbl_IDS_Kunden")
 
@@ -1924,35 +1951,35 @@ Public Class usrcntlKundeBearbeitenFull
             .DataSource.Columns("bnk_KundenNr").DefaultValue = KUNDE.KundenNr
 
             .Columns(0).Visible = False
-            .Columns(6).Visible = False
+            .Columns(5).Visible = False
             If archivierteDSAnzeigen Then
+                .Columns(7).Visible = True
                 .Columns(8).Visible = True
-                .Columns(9).Visible = True
-                .Columns(8).HeaderText = "geschlossen"
-                .Columns(9).HeaderText = "geschl. am"
+                .Columns(7).HeaderText = "geschlossen"
+                .Columns(8).HeaderText = "eröff./geschl. am"
                 '.Columns(8).ReadOnly = False
                 '.Columns(9).ReadOnly = False
             Else
-                .Columns(8).Visible = False
-                .Columns(9).HeaderText = "eröff. am"
+                .Columns(7).Visible = False
+                '.Columns(7).HeaderText = "eröffn."
+                .Columns(8).HeaderText = "eröff. am"
             End If
 
             .Columns(1).HeaderText = "Kd-Nr."
-
             .Columns(2).HeaderText = "IBAN"
             .Columns(3).HeaderText = "BIC"
             .Columns(4).HeaderText = "Name"
-            .Columns(5).HeaderText = "Adresse"
-            .Columns(7).HeaderText = "Hauptkonto"
-            .Columns(7).Width = 60
+            .Columns(6).HeaderText = "HK"
+            .Columns(6).Width = 50
+            .Columns(7).Width = 75
 
-            .Columns(8).Width = 40
+            .Columns(4).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
 
             .Columns(2).ReadOnly = Not bearbeiten
             .Columns(3).ReadOnly = Not bearbeiten
             .Columns(4).ReadOnly = Not bearbeiten
             .Columns(5).ReadOnly = Not bearbeiten
-            .Columns(7).ReadOnly = Not bearbeiten
+            .Columns(6).ReadOnly = Not bearbeiten
 
             If Not .Columns.Contains("clmnPDF") Then
                 Dim c As New DataGridViewImageColumn
@@ -2058,7 +2085,7 @@ Public Class usrcntlKundeBearbeitenFull
             Exit Sub
         End If
 
-        Dim Bankname = IIf(dgvBankverbindungen.CurrentRow.Cells("bnk_name").Value IsNot Nothing, dgvBankverbindungen.CurrentRow.Cells("bnk_name").Value, "BANK")
+        Dim Bankname = IIf(dgvBankverbindungen.CurrentRow.Cells("bnk_anschrift").Value IsNot Nothing, dgvBankverbindungen.CurrentRow.Cells("bnk_anschrift").Value, "BANK")
         Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "KD_ANHÄNGE", "BANKVERBINDUNG", "", "", Bankname, KUNDE.KundenNr)
         If DS.uploadDataToDATENSERVERFileDialog(, ".pdf", , "PDF") Then
             sql.doSQLVarList("UPDATE [tblBankverbindungen] set bnk_daid= " & DS.da_id & " WHERE bnk_id=" & dgvBankverbindungen.CurrentRow.Cells("bnk_id").Value, "FMZOLL")
@@ -2066,4 +2093,32 @@ Public Class usrcntlKundeBearbeitenFull
 
         End If
     End Sub
+
+
+
+    Private Sub dgvBankverbindungen_CellContentDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvBankverbindungen.CellContentDoubleClick
+
+        Try
+            If e.RowIndex >= 0 AndAlso e.ColumnIndex = 9 Then
+                Dim dsID = dgvBankverbindungen.Rows(e.RowIndex).Cells("bnk_daid").Value
+
+                If dsID > 0 Then
+                    Me.Cursor = Cursors.WaitCursor
+                    Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dsID)
+                    DS.OPEN_SINGLE()
+                End If
+            End If
+
+
+
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+            Me.Cursor = Cursors.Default
+        End Try
+
+        Me.Cursor = Cursors.Default
+
+
+    End Sub
+
 End Class
diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb
index 2b293089..3fee7078 100644
--- a/SDL/mdm/frmMDMDatenverarbetiung.vb
+++ b/SDL/mdm/frmMDMDatenverarbetiung.vb
@@ -621,6 +621,8 @@ Public Class frmMDMDatenverarbetiung
         Dim sumperKdNrBrutto As Double = 0
 
 
+        '=([Netto]-[Rabatt])/[Liter]
+
         AddHandler rpt.Detail.Format, Sub()
 
 
@@ -629,16 +631,16 @@ Public Class frmMDMDatenverarbetiung
                                           rpt.lblKartennr.Text = "VERAG-KdNr: " & SQL.isDbnullEmpty(rpt.Fields.Item("AdressenNr").Value, "") & IIf(SQL.isDbnullEmpty(rpt.Fields.Item("Rabatt").Value, "") <> "", "  abgezogener Rabatt:" & SQL.isDbnullEmpty(rpt.Fields.Item("Rabatt").Value & "", ""), "")
 
                                           rpt.lblNetto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Liter").Value, 2, "")
-                                          rpt.lblMWST.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Netto").Value, 2, "")
+                                          rpt.lblMWST.Text = SQL.isDbnullEmptyDbl(CDbl(rpt.Fields.Item("Netto").Value) - CDbl(rpt.Fields.Item("Rabatt").Value) / CDbl(rpt.Fields.Item("Liter").Value), 2, "")
                                           rpt.lblBrutto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Brutto").Value, 2, "")
 
 
                                           rpt.lblSumNet.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Liter").Value, 2, "")
-                                          rpt.lblSumVat.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Netto").Value, 2, "")
+                                          rpt.lblSumVat.Text = SQL.isDbnullEmptyDbl(CDbl(rpt.Fields.Item("Netto").Value) - CDbl(rpt.Fields.Item("Rabatt").Value) / CDbl(rpt.Fields.Item("Liter").Value), 2, "")
                                           rpt.lblSumBrt.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Brutto").Value, 2, "")
 
                                           sumNetto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Liter").Value, 4, 0)
-                                          sumMWST += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Netto").Value, 4, 0)
+                                          sumMWST += SQL.isDbnullEmptyDbl(CDbl(rpt.Fields.Item("Netto").Value) - CDbl(rpt.Fields.Item("Rabatt").Value) / CDbl(rpt.Fields.Item("Liter").Value), 4, 0)
                                           sumBrutto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Brutto").Value, 4, 0)
 
 
diff --git a/SDL/zoll/usrCntlAuswertungenEV_Veranlagungen.vb b/SDL/zoll/usrCntlAuswertungenEV_Veranlagungen.vb
index 7edb94ce..c487e11a 100644
--- a/SDL/zoll/usrCntlAuswertungenEV_Veranlagungen.vb
+++ b/SDL/zoll/usrCntlAuswertungenEV_Veranlagungen.vb
@@ -148,7 +148,7 @@
                                     'EUST
                                     Dim dtEUST = SQL.loadDgvBySql("select sum(base) Base,sum(Amnt)Amnt FROM ztIMsgGdsItemDutyCalc as GDS inner join zzAktivitaet as AKT on GDS.OperatorID=AKT.OperatorID AND GDS.LizenzNr=AKT.LizenzNr AND GDS.IMsgID=AKT.IMsgID
                                         inner join zsAnmRefs as ANM on ANM.LizenzNr=AKT.LizenzNr And  ANM.OperatorID=AKT.OperatorID And  ANM.AnmID=AKT.AnmID  
-                                        where  Ty IN ('5EV') and  LRN LIKE '" & BezugsNr & "' AND ErledigungsTypID LIKE 'F%'", EZOLL_SQLSRV)
+                                        where  Ty IN ('5EV') and  ANM.LRN LIKE '" & BezugsNr & "' AND ErledigungsTypID LIKE 'F%'", EZOLL_SQLSRV)
                                     If dtEUST IsNot Nothing AndAlso dtEUST.Rows.Count >= 0 Then
                                         If dtEUST(0)("Base") IsNot DBNull.Value Then EUST_Basis = dtEUST(0)("Base")
                                         If dtEUST(0)("Amnt") IsNot DBNull.Value Then EUST_5EV = dtEUST(0)("Amnt")
@@ -156,8 +156,8 @@
 
                                     'Handelsrechnungen
 
-                                    Dim dtRg = SQL.DLookupArray("distinct(DRef)", "[zsAnmGdsItemDocCerts] As DOC inner join zsAnmRefs As ANM On ANM.LizenzNr=DOC.LizenzNr And  ANM.OperatorID=DOC.OperatorID And  ANM.AnmID=DOC.AnmID", "(LRN = '" & BezugsNr & "') and DocCd IN ('N380','N325')", EZOLL_SQLSRV, "DRef")
-                                        For Each rg In dtRg
+                                    Dim dtRg = SQL.DLookupArray("distinct(DRef)", "[zsAnmGdsItemDocCerts] As DOC inner join zsAnmRefs As ANM On ANM.LizenzNr=DOC.LizenzNr And  ANM.OperatorID=DOC.OperatorID And  ANM.AnmID=DOC.AnmID", "(ANM.LRN = '" & BezugsNr & "') and DocCd IN ('N380','N325')", EZOLL_SQLSRV, "DRef")
+                                    For Each rg In dtRg
                                             handelsrechnungen &= semi & rg : semi = ","
                                         Next
 
diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb
index 665f872e..a53ddf9d 100644
--- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb
+++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb
@@ -58,8 +58,9 @@ Public Class cMSEAPI
             Dim curDateTime As Integer = jwt.GenNumericDate(0)
 
             ' Set the timestamp defining an expiration time (end time) for the token
-            ' to be now + 10 MIN (600 seconds)
-            success = claims.AddIntAt(-1, "exp", curDateTime + 600)
+            ' to be now + 20 MIN (1200 seconds)
+            'Import von ca 30 000 DS dauert schon mal länger als 15min!
+            success = claims.AddIntAt(-1, "exp", curDateTime + 1200)
 
             jwt.AutoCompact = True
 
@@ -1363,14 +1364,15 @@ Public Class cMSEAPI
                     FROM [VERAG].[dbo].[tblMSESettlements] as bills 
                     left join [VERAG].[dbo].[tblMSETransactions] as trans on bills.[transaction_id] = trans.[transaction_id] 
                     left join [VERAG].[dbo].[tblMSECustomers] as cust on cust.partner_customer_number = trans.partner_haulier_id 
-                    where bills.invoice_date Between '" & von & "' And '" & bis & "'and trans.charged = 1 and cust.[partner_customer_number] = " & KundenNr & " and trans.transaction_country = '" & LandKZ & "'  and trans.original_currency = '" & Wahrungscode & "' 
+                    left join [VERAG].[dbo].[tblMSEInvoices] as inv on inv.customer_number = cust.customer_id and bills.invoice_date = inv.invoice_date and inv.country = trans.transaction_country 
+                    where bills.invoice_date Between '" & von & "' And '" & bis & "'and trans.charged = 1 and cust.[partner_customer_number] = " & KundenNr & " and trans.transaction_country = '" & LandKZ & "'  and trans.original_currency = '" & Wahrungscode & "' AND isnull(inv.archiv,0) = " & IIf(Archiv IsNot Nothing AndAlso Archiv, 1, 0) & " 
                     group by bills.invoice_date, bills.invoice_number, cust.[customer_id], bills.specification_page_name, trans.original_currency) as temp
                     where temp.UST <> 0", conn)
 
                     cmd.Parameters.AddWithValue("@von", von)
                     cmd.Parameters.AddWithValue("@bis", bis)
                     cmd.Parameters.AddWithValue("@AdressenNr", KundenNr)
-                    'If Archiv IsNot Nothing Then cmd.Parameters.AddWithValue("@Archiv", If(Archiv, 1, 0))
+                    If Archiv IsNot Nothing Then cmd.Parameters.AddWithValue("@Archiv", If(Archiv, 1, 0))
 
                     Dim dr = cmd.ExecuteReader()
                     dt.Load(dr)
@@ -1390,7 +1392,7 @@ Public Class cMSEAPI
     End Function
 
 
-    Public Shared Function UPDATE_ARCHIV(reDat As Date, reNr As Integer, mse_kdNr As Integer) As Boolean
+    Public Shared Function UPDATE_ARCHIV(reDat As Date, reNr As Integer, mse_kdNr As Integer, country As String) As Boolean
         Try
             Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
 
@@ -1398,12 +1400,13 @@ Public Class cMSEAPI
             list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("reDat", reDat))
             list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("reNr", reNr))
             list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mse_kdNr", mse_kdNr))
+            list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("country", country))
 
 
             Return SQL.doSQLVarList("
 
                     UPDATE [tblMSEInvoices] set archiv=1, [archiviertDatum]=GETDATE()
-                    WHERE cast(invoice_date as date) = @reDat and invoice_id = @reNr and customer_number=@mse_kdNr
+                    WHERE cast(invoice_date as date) = @reDat and invoice_id = @reNr and customer_number=@mse_kdNr and country = @country
                 ", "FMZOLL",, list)
 
         Catch ex As Exception