KuundenAdresse Zusatz; MDM: UTA-Mautberichterstellung; VZPreise;Teleotec-Doks;MA-AccessCode GRN AT

SDL/Fakturierung/cFakturierung.vb

@@ -384,9 +384,13 @@ Public Class cFakturierung
                                     End Select
                                 Else
                                     If diff > 0 Then 'Guthaben
+                                        'Select Case RECHNUNG.RechnungSprache
+                                        '    Case "EN" : strText = strText & "An advance payment has already been made for this invoice, resulting in a credit balance of " & diff.ToString("C2") & "." & vbCrLf
+                                        '    Case Else : strText = strText & "Zu dieser Rechnung wurde bereits eine Vorauszahlung geleistet, daraus ergibt sich ein Guthaben von " & diff.ToString("C2") & "." & vbCrLf
+                                        'End Select
                                         Select Case RECHNUNG.RechnungSprache
-                                            Case "EN" : strText = strText & "An advance payment has already been made for this invoice, resulting in a credit balance of " & diff.ToString("C2") & "." & vbCrLf
+                                            Case "EN" : strText = strText & "An advance payment has already been made for this invoice." & vbCrLf
-                                            Case Else : strText = strText & "Zu dieser Rechnung wurde bereits eine Vorauszahlung geleistet, daraus ergibt sich ein Guthaben von " & diff.ToString("C2") & "." & vbCrLf
+                                            Case Else : strText = strText & "Zu dieser Rechnung wurde bereits eine Vorauszahlung geleistet." & vbCrLf
                                         End Select
                                     Else 'Nachzahlung
                                         Select Case RECHNUNG.RechnungSprache
@@ -1026,17 +1030,24 @@ Public Class cFakturierung
             If rpt.txtGrenze.Text = String.Empty Then rpt.txtGrenze.Text = SQL.getValueTxtBySql("SELECT TOP 1 isnull([Grenzstelle],'')   FROM [Filialen]  where FilialenNr='" & RECHNUNG.FilialenNr & "'", "FMZOLL")
             If rpt.txtGrenze.Text = String.Empty Then rpt.txtGrenzeUeberschrift.Visible = False
 
+            rpt.lblRechnungAn.Text = If(RECHNUNG.RechnungsName_1, "") & vbNewLine
+            If If(RECHNUNG.RechnungsName_2, "") <> "" Then rpt.lblRechnungAn.Text &= RECHNUNG.RechnungsName_2 & vbNewLine
+            If If(RECHNUNG.RechnungsName_AdressZusatz, "") <> "" Then rpt.lblRechnungAn.Text &= RECHNUNG.RechnungsName_AdressZusatz & vbNewLine
+            If If(RECHNUNG.RechnungsStraße, "") <> "" Then rpt.lblRechnungAn.Text &= RECHNUNG.RechnungsStraße & vbNewLine
+            If If(RECHNUNG.RechnungsOrt, "") <> "" Then rpt.lblRechnungAn.Text &= RECHNUNG.RechnungsOrt & vbNewLine
+            If If(RECHNUNG.RechnungsLandKz, "") <> "" Then rpt.lblRechnungAn.Text &= cProgramFunctions.getLandBez_fromISO1Land(RECHNUNG.RechnungsLandKz, "", RECHNUNG.RechnungSprache).ToString.ToUpper
 
-            If If(RECHNUNG.RechnungsName_2, "") = "" Then
+
-                rpt.lblRechnung_Name1.Text = ""
+            'If If(RECHNUNG.RechnungsName_2, "") = "" Then
-                rpt.lblRechnung_Name2.Text = If(RECHNUNG.RechnungsName_1, "")
+            '    rpt.lblRechnung_Name1.Text = ""
-            Else
+            '    rpt.lblRechnung_Name2.Text = If(RECHNUNG.RechnungsName_1, "")
-                rpt.lblRechnung_Name1.Text = If(RECHNUNG.RechnungsName_1, "")
+            'Else
-                rpt.lblRechnung_Name2.Text = If(RECHNUNG.RechnungsName_2, "")
+            '    rpt.lblRechnung_Name1.Text = If(RECHNUNG.RechnungsName_1, "")
-            End If
+            '    rpt.lblRechnung_Name2.Text = If(RECHNUNG.RechnungsName_2, "")
-            rpt.lblRechnung_Strasse.Text = If(RECHNUNG.RechnungsStraße, "")
+            'End If
-            rpt.lblRechnung_Ort.Text = If(RECHNUNG.RechnungsOrt, "")
+            'rpt.lblRechnung_Strasse.Text = If(RECHNUNG.RechnungsStraße, "")
-            rpt.lblRechnung_Land.Text = cProgramFunctions.getLandBez_fromISO1Land(RECHNUNG.RechnungsLandKz, "", RECHNUNG.RechnungSprache).ToString.ToUpper
+            'rpt.lblRechnung_Ort.Text = If(RECHNUNG.RechnungsOrt, "")
+            'rpt.lblRechnung_Land.Text = cProgramFunctions.getLandBez_fromISO1Land(RECHNUNG.RechnungsLandKz, "", RECHNUNG.RechnungSprache).ToString.ToUpper
 
             If KD_RG IsNot Nothing AndAlso If(KD_RG.Steuernummer, "") <> String.Empty Then
                 rpt.lblRechnung_Steuernummer.Text = If(KD_RG.LandKz, "") & " " & If(KD_RG.Steuernummer, "").ToString.Trim
@@ -2525,17 +2536,25 @@ Public Class cFakturierung
 
             rpt.txtKdAuftragsnummer.Text = If(ROW("KdAuftragsNr") IsNot DBNull.Value, ROW("KdAuftragsNr"), "")
 
-            If If(ROW("RechnungsName 2") IsNot DBNull.Value, ROW("RechnungsName 2"), "") = "" Then
-                rpt.lblRechnung_Name1.Text = ""
-                rpt.lblRechnung_Name2.Text = ROW("RechnungsName 1")
-            Else
-                rpt.lblRechnung_Name1.Text = ROW("RechnungsName 1")
-                rpt.lblRechnung_Name2.Text = If(ROW("RechnungsName 2") IsNot DBNull.Value, ROW("RechnungsName 2"), "")
-            End If
 
-            rpt.lblRechnung_Strasse.Text = If(ROW("RechnungsStraße") IsNot DBNull.Value, ROW("RechnungsStraße"), "")
+            rpt.lblRechnungAn.Text = ROW("RechnungsName 1") & vbNewLine
-            rpt.lblRechnung_Ort.Text = If(ROW("RechnungsOrt") IsNot DBNull.Value, ROW("RechnungsOrt"), "")
+            If ROW("RechnungsName 2") IsNot DBNull.Value AndAlso ROW("RechnungsName 2") <> "" Then rpt.lblRechnungAn.Text &= ROW("RechnungsName 2") & vbNewLine
-            rpt.lblRechnung_Land.Text = cProgramFunctions.getLandBez_fromISO1Land(ROW("RechnungsLandKz"), "", ROW("RechnungSprache")).ToString.ToUpper
+            If ROW("RechnungsName_AdressZusatz") IsNot DBNull.Value AndAlso ROW("RechnungsName_AdressZusatz") <> "" Then rpt.lblRechnungAn.Text &= ROW("RechnungsName_AdressZusatz") & vbNewLine
+            If ROW("RechnungsStraße") IsNot DBNull.Value AndAlso ROW("RechnungsStraße") <> "" Then rpt.lblRechnungAn.Text &= ROW("RechnungsStraße") & vbNewLine
+            If ROW("RechnungsOrt") IsNot DBNull.Value AndAlso ROW("RechnungsOrt") <> "" Then rpt.lblRechnungAn.Text &= ROW("RechnungsOrt") & vbNewLine
+            If ROW("RechnungsLandKz") IsNot DBNull.Value AndAlso ROW("RechnungsLandKz") <> "" Then rpt.lblRechnungAn.Text &= cProgramFunctions.getLandBez_fromISO1Land(ROW("RechnungsLandKz"), "", ROW("RechnungSprache")).ToString.ToUpper
+
+            'If If(ROW("RechnungsName 2") IsNot DBNull.Value, ROW("RechnungsName 2"), "") = "" Then
+            '    rpt.lblRechnung_Name1.Text = ""
+            '    rpt.lblRechnung_Name2.Text = ROW("RechnungsName 1")
+            'Else
+            '    rpt.lblRechnung_Name1.Text = ROW("RechnungsName 1")
+            '    rpt.lblRechnung_Name2.Text = If(ROW("RechnungsName 2") IsNot DBNull.Value, ROW("RechnungsName 2"), "")
+            'End If
+
+            'rpt.lblRechnung_Strasse.Text = If(ROW("RechnungsStraße") IsNot DBNull.Value, ROW("RechnungsStraße"), "")
+            'rpt.lblRechnung_Ort.Text = If(ROW("RechnungsOrt") IsNot DBNull.Value, ROW("RechnungsOrt"), "")
+            'rpt.lblRechnung_Land.Text = cProgramFunctions.getLandBez_fromISO1Land(ROW("RechnungsLandKz"), "", ROW("RechnungSprache")).ToString.ToUpper
 
 
             If KD_RG IsNot Nothing AndAlso If(KD_RG.Steuernummer, "") <> String.Empty Then
@@ -2952,17 +2971,25 @@ Public Class cFakturierung
             rpt.lblLKWId.Text = getLKWID(RechnungsNr, DruckdatumUhrzeit, Rgstatus)
             rpt.lblLKWIdUebeschrift.Visible = (rpt.lblLKWId.Text <> "")
 
-            If If(ROW("RechnungsName 2") IsNot DBNull.Value, ROW("RechnungsName 2"), "") = "" Then
-                rpt.lblRechnung_Name1.Text = ""
-                rpt.lblRechnung_Name2.Text = ROW("RechnungsName 1")
-            Else
-                rpt.lblRechnung_Name1.Text = ROW("RechnungsName 1")
-                rpt.lblRechnung_Name2.Text = If(ROW("RechnungsName 2") IsNot DBNull.Value, ROW("RechnungsName 2"), "")
-            End If
 
-            rpt.lblRechnung_Strasse.Text = If(ROW("RechnungsStraße") IsNot DBNull.Value, ROW("RechnungsStraße"), "")
+            rpt.lblRechnungAn.Text = ROW("RechnungsName 1") & vbNewLine
-            rpt.lblRechnung_Ort.Text = If(ROW("RechnungsOrt") IsNot DBNull.Value, ROW("RechnungsOrt"), "")
+            If ROW("RechnungsName 2") IsNot DBNull.Value AndAlso ROW("RechnungsName 2") <> "" Then rpt.lblRechnungAn.Text &= ROW("RechnungsName 2") & vbNewLine
-            rpt.lblRechnung_Land.Text = cProgramFunctions.getLandBez_fromISO1Land(ROW("RechnungsLandKz"), "", ROW("RechnungSprache")).ToString.ToUpper
+            If ROW("RechnungsName_AdressZusatz") IsNot DBNull.Value AndAlso ROW("RechnungsName_AdressZusatz") <> "" Then rpt.lblRechnungAn.Text &= ROW("RechnungsName_AdressZusatz") & vbNewLine
+            If ROW("RechnungsStraße") IsNot DBNull.Value AndAlso ROW("RechnungsStraße") <> "" Then rpt.lblRechnungAn.Text &= ROW("RechnungsStraße") & vbNewLine
+            If ROW("RechnungsOrt") IsNot DBNull.Value AndAlso ROW("RechnungsOrt") <> "" Then rpt.lblRechnungAn.Text &= ROW("RechnungsOrt") & vbNewLine
+            If ROW("RechnungsLandKz") IsNot DBNull.Value AndAlso ROW("RechnungsLandKz") <> "" Then rpt.lblRechnungAn.Text &= cProgramFunctions.getLandBez_fromISO1Land(ROW("RechnungsLandKz"), "", ROW("RechnungSprache")).ToString.ToUpper
+
+            'If If(ROW("RechnungsName 2") IsNot DBNull.Value, ROW("RechnungsName 2"), "") = "" Then
+            '    rpt.lblRechnung_Name1.Text = ""
+            '    rpt.lblRechnung_Name2.Text = ROW("RechnungsName 1")
+            'Else
+            '    rpt.lblRechnung_Name1.Text = ROW("RechnungsName 1")
+            '    rpt.lblRechnung_Name2.Text = If(ROW("RechnungsName 2") IsNot DBNull.Value, ROW("RechnungsName 2"), "")
+            'End If
+
+            'rpt.lblRechnung_Strasse.Text = If(ROW("RechnungsStraße") IsNot DBNull.Value, ROW("RechnungsStraße"), "")
+            'rpt.lblRechnung_Ort.Text = If(ROW("RechnungsOrt") IsNot DBNull.Value, ROW("RechnungsOrt"), "")
+            'rpt.lblRechnung_Land.Text = cProgramFunctions.getLandBez_fromISO1Land(ROW("RechnungsLandKz"), "", ROW("RechnungSprache")).ToString.ToUpper
 
 
             If KD_RG IsNot Nothing AndAlso If(KD_RG.Steuernummer, "") <> String.Empty Then
@@ -3198,7 +3225,7 @@ Public Class cFakturierung
                       MIN(Rechnungsausgang.BelegartenNr) AS BelegartenNr, MIN(Rechnungsausgang.BelegartenKz) AS BelegartenKz, 
                       MIN(Rechnungsausgang.BelegartenBez) AS BelegartenBez, MIN(Rechnungsausgang.KundenNrZentrale) AS KundenNrZentrale, 
                       MIN(Rechnungsausgang.RechnungsKundenNr) AS RechnungsKundenNr, MIN(Rechnungsausgang.[RechnungsName 1]) AS [RechnungsName 1],
-                       MIN(Rechnungsausgang.[RechnungsName 2]) AS [RechnungsName 2], MIN(Rechnungsausgang.RechnungsStraße) AS RechnungsStraße,
+                       MIN(Rechnungsausgang.[RechnungsName 2]) AS [RechnungsName 2],MIN(RechnungsName_AdressZusatz) as RechnungsName_AdressZusatz, MIN(Rechnungsausgang.RechnungsStraße) AS RechnungsStraße,
                         MIN(Rechnungsausgang.RechnungsOrt) AS RechnungsOrt, MIN(Rechnungsausgang.RechnungsUstIdKz) AS RechnungsUstIdKz, 
 	                    MIN(Rechnungsausgang.RechnungsUstIdNr) AS RechnungsUstIdNr, MIN(cast(Rechnungsausgang.Lastschrift as int)) AS Lastschrift, 
 	                    Sum(RechnungsausgangPositionen.Anzahl) AS Anzahl, Sum(RechnungsausgangPositionen.SteuerpflichtigerBetrag) AS SteuerpflichtigerBetrag, 

SDL/Fakturierung/frmFaktEmail.vb

@@ -479,19 +479,19 @@ Public Class frmFaktEmail
         Select Case RechnungsLandKz
             Case "TR"
                 addRgData_ZF_Passau &= "Sender: " & RECHNUNG.AbsenderName_1 & ", " & If(RECHNUNG.AbsenderOrt, "") & vbNewLine
-                If ZOLLANMELDUNG.getDataByBezugsnummer(RECHNUNG.FilialenNr & "/" & RECHNUNG.AbfertigungsNr, SPEDBUCH.Abfertigungsart, "") Then
+                If ZOLLANMELDUNG.getDataByBezugsnummer(RECHNUNG.FilialenNr & "/" & RECHNUNG.AbfertigungsNr, SPEDBUCH.Abfertigungsart, "", SPEDBUCH.Grenzstelle) Then
                     addRgData_ZF_Passau &= "Invoice-No.: " & ZOLLANMELDUNG.Handelsrechnung.Replace(", ", "," & vbNewLine) & vbNewLine
                     addRgData_ZF_Passau &= "Invoice-Total: " & ZOLLANMELDUNG.Rechnungspreis & vbNewLine
                 End If
             Case "A", "AT", "D", "DE", "CH"
                 addRgData_ZF_Passau &= "Absender: " & RECHNUNG.AbsenderName_1 & ", " & If(RECHNUNG.AbsenderOrt, "") & vbNewLine
-                If ZOLLANMELDUNG.getDataByBezugsnummer(RECHNUNG.FilialenNr & "/" & RECHNUNG.AbfertigungsNr, SPEDBUCH.Abfertigungsart, "") Then
+                If ZOLLANMELDUNG.getDataByBezugsnummer(RECHNUNG.FilialenNr & "/" & RECHNUNG.AbfertigungsNr, SPEDBUCH.Abfertigungsart, "", SPEDBUCH.Grenzstelle) Then
                     addRgData_ZF_Passau &= "Handelsrechnungs-Nr.: " & ZOLLANMELDUNG.Handelsrechnung.Replace(", ", "," & vbNewLine) & vbNewLine
                     addRgData_ZF_Passau &= "Handelsrechnungs-Betrag: " & ZOLLANMELDUNG.Rechnungspreis & vbNewLine
                 End If
             Case Else
                 addRgData_ZF_Passau &= "Sender: " & RECHNUNG.AbsenderName_1 & ", " & If(RECHNUNG.AbsenderOrt, "") & vbNewLine
-                If ZOLLANMELDUNG.getDataByBezugsnummer(RECHNUNG.FilialenNr & "/" & RECHNUNG.AbfertigungsNr, SPEDBUCH.Abfertigungsart, "") Then
+                If ZOLLANMELDUNG.getDataByBezugsnummer(RECHNUNG.FilialenNr & "/" & RECHNUNG.AbfertigungsNr, SPEDBUCH.Abfertigungsart, "", SPEDBUCH.Grenzstelle) Then
                     addRgData_ZF_Passau &= "Invoice-No.: " & ZOLLANMELDUNG.Handelsrechnung.Replace(", ", "," & vbNewLine) & vbNewLine
                     addRgData_ZF_Passau &= "Invoice-Total: " & ZOLLANMELDUNG.Rechnungspreis & vbNewLine
                 End If

SDL/Fakturierung/rptRechnungDruck.Designer.vb

@@ -62,10 +62,6 @@ Partial Public Class rptRechnungDruck
         Me.lblFirmenbuch = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblUIDUeberschrift = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblUID = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.lblRechnung_Name1 = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.lblRechnung_Name2 = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.lblRechnung_Strasse = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.lblRechnung_Ort = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblEORIUeberschrift = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblEORI = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblRechnung_UID_Ueberschrift = New GrapeCity.ActiveReports.SectionReportModel.Label()
@@ -76,9 +72,9 @@ Partial Public Class rptRechnungDruck
         Me.txtKdAuftragsNr = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
         Me.Line15 = New GrapeCity.ActiveReports.SectionReportModel.Line()
         Me.lblFirma = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.lblRechnung_Land = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.Label1 = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.Label2 = New GrapeCity.ActiveReports.SectionReportModel.Label()
+        Me.lblRechnungAn = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.ReportFooter1 = New GrapeCity.ActiveReports.SectionReportModel.ReportFooter()
         Me.Line8 = New GrapeCity.ActiveReports.SectionReportModel.Line()
         Me.Line9 = New GrapeCity.ActiveReports.SectionReportModel.Line()
@@ -167,10 +163,6 @@ Partial Public Class rptRechnungDruck
         CType(Me.lblFirmenbuch, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblUIDUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblUID, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.lblRechnung_Name1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.lblRechnung_Name2, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.lblRechnung_Strasse, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.lblRechnung_Ort, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblEORIUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblEORI, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblRechnung_UID_Ueberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -180,9 +172,9 @@ Partial Public Class rptRechnungDruck
         CType(Me.txtKdAuftragsNr_Ueberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.txtKdAuftragsNr, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblFirma, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.lblRechnung_Land, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.Label1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.Label2, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.lblRechnungAn, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblSummeUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblSteuerfreiGes, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblSteuerpflichtigGes, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -396,7 +388,7 @@ Partial Public Class rptRechnungDruck
         '
         'ReportHeader1
         '
-        Me.ReportHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lblRgNr, Me.lblRgNrUeberschrift, Me.Picture1, Me.picVERAG, Me.lblKundenNrUeberschrift, Me.lblUeberschriftRG_GS, Me.lblKundenNr, Me.Line3, Me.lblFirmaOrt, Me.lblFirmaStrasse, Me.lblFirmaTel, Me.lblFirmaFax, Me.lblFirmaEmail, Me.lblFirmaWeb, Me.lblRgDatumUeberschrift, Me.lblRgDatum, Me.lblAbfertigungsNrUeberschrift, Me.lblAbfertigungsNr, Me.lblAbfertigungsDatumUeberschrift, Me.lblAbfertigungsDatum, Me.lblLKWIdUebeschrift, Me.lblLKWId, Me.lblSachbearbeiterUeberschrift, Me.lblSachbearbeiter, Me.lblFirmenbuchUeberschrift, Me.lblFirmenbuch, Me.lblUIDUeberschrift, Me.lblUID, Me.lblRechnung_Name1, Me.lblRechnung_Name2, Me.lblRechnung_Strasse, Me.lblRechnung_Ort, Me.lblEORIUeberschrift, Me.lblEORI, Me.lblRechnung_UID_Ueberschrift, Me.lblRechnung_UID, Me.lblRechnung_Steuernummer_Ueberschrift, Me.lblRechnung_Steuernummer, Me.txtKdAuftragsNr_Ueberschrift, Me.txtKdAuftragsNr, Me.Line15, Me.lblFirma, Me.lblRechnung_Land, Me.Label1, Me.Label2})
+        Me.ReportHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lblRgNr, Me.lblRgNrUeberschrift, Me.Picture1, Me.picVERAG, Me.lblKundenNrUeberschrift, Me.lblUeberschriftRG_GS, Me.lblKundenNr, Me.Line3, Me.lblFirmaOrt, Me.lblFirmaStrasse, Me.lblFirmaTel, Me.lblFirmaFax, Me.lblFirmaEmail, Me.lblFirmaWeb, Me.lblRgDatumUeberschrift, Me.lblRgDatum, Me.lblAbfertigungsNrUeberschrift, Me.lblAbfertigungsNr, Me.lblAbfertigungsDatumUeberschrift, Me.lblAbfertigungsDatum, Me.lblLKWIdUebeschrift, Me.lblLKWId, Me.lblSachbearbeiterUeberschrift, Me.lblSachbearbeiter, Me.lblFirmenbuchUeberschrift, Me.lblFirmenbuch, Me.lblUIDUeberschrift, Me.lblUID, Me.lblEORIUeberschrift, Me.lblEORI, Me.lblRechnung_UID_Ueberschrift, Me.lblRechnung_UID, Me.lblRechnung_Steuernummer_Ueberschrift, Me.lblRechnung_Steuernummer, Me.txtKdAuftragsNr_Ueberschrift, Me.txtKdAuftragsNr, Me.Line15, Me.lblFirma, Me.Label1, Me.Label2, Me.lblRechnungAn})
         Me.ReportHeader1.Height = 3.470997!
         Me.ReportHeader1.Name = "ReportHeader1"
         '
@@ -735,54 +727,6 @@ Partial Public Class rptRechnungDruck
         Me.lblUID.Top = 2.249606!
         Me.lblUID.Width = 1.958268!
         '
-        'lblRechnung_Name1
-        '
-        Me.lblRechnung_Name1.Height = 0.1771654!
-        Me.lblRechnung_Name1.HyperLink = Nothing
-        Me.lblRechnung_Name1.Left = 0.515!
-        Me.lblRechnung_Name1.Name = "lblRechnung_Name1"
-        Me.lblRechnung_Name1.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" &
-    "do-char-set: 1"
-        Me.lblRechnung_Name1.Text = "VERAG Spedition AG"
-        Me.lblRechnung_Name1.Top = 1.679!
-        Me.lblRechnung_Name1.Width = 4.589764!
-        '
-        'lblRechnung_Name2
-        '
-        Me.lblRechnung_Name2.Height = 0.1771653!
-        Me.lblRechnung_Name2.HyperLink = Nothing
-        Me.lblRechnung_Name2.Left = 0.515!
-        Me.lblRechnung_Name2.Name = "lblRechnung_Name2"
-        Me.lblRechnung_Name2.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" &
-    "do-char-set: 1"
-        Me.lblRechnung_Name2.Text = "Abteilung: ZOLL"
-        Me.lblRechnung_Name2.Top = 1.856165!
-        Me.lblRechnung_Name2.Width = 4.589763!
-        '
-        'lblRechnung_Strasse
-        '
-        Me.lblRechnung_Strasse.Height = 0.1771653!
-        Me.lblRechnung_Strasse.HyperLink = Nothing
-        Me.lblRechnung_Strasse.Left = 0.515!
-        Me.lblRechnung_Strasse.Name = "lblRechnung_Strasse"
-        Me.lblRechnung_Strasse.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" &
-    "do-char-set: 1"
-        Me.lblRechnung_Strasse.Text = "Suben Nr. 100"
-        Me.lblRechnung_Strasse.Top = 2.033329!
-        Me.lblRechnung_Strasse.Width = 4.589763!
-        '
-        'lblRechnung_Ort
-        '
-        Me.lblRechnung_Ort.Height = 0.1771653!
-        Me.lblRechnung_Ort.HyperLink = Nothing
-        Me.lblRechnung_Ort.Left = 0.5149997!
-        Me.lblRechnung_Ort.Name = "lblRechnung_Ort"
-        Me.lblRechnung_Ort.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" &
-    "do-char-set: 1"
-        Me.lblRechnung_Ort.Text = "A 4975 SUBEN"
-        Me.lblRechnung_Ort.Top = 2.210495!
-        Me.lblRechnung_Ort.Width = 4.589763!
-        '
         'lblEORIUeberschrift
         '
         Me.lblEORIUeberschrift.Height = 0.1574803!
@@ -903,18 +847,6 @@ Partial Public Class rptRechnungDruck
         Me.lblFirma.Top = 1.498291!
         Me.lblFirma.Width = 3.619686!
         '
-        'lblRechnung_Land
-        '
-        Me.lblRechnung_Land.Height = 0.1771653!
-        Me.lblRechnung_Land.HyperLink = Nothing
-        Me.lblRechnung_Land.Left = 0.515!
-        Me.lblRechnung_Land.Name = "lblRechnung_Land"
-        Me.lblRechnung_Land.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" &
-    "do-char-set: 1"
-        Me.lblRechnung_Land.Text = "ÖSTERREICH"
-        Me.lblRechnung_Land.Top = 2.387661!
-        Me.lblRechnung_Land.Width = 4.589763!
-        '
         'Label1
         '
         Me.Label1.Height = 0.1574803!
@@ -941,6 +873,19 @@ Partial Public Class rptRechnungDruck
         Me.Label2.Visible = False
         Me.Label2.Width = 1.958268!
         '
+        'lblRechnungAn
+        '
+        Me.lblRechnungAn.Height = 1.291339!
+        Me.lblRechnungAn.HyperLink = Nothing
+        Me.lblRechnungAn.Left = 0.514567!
+        Me.lblRechnungAn.Name = "lblRechnungAn"
+        Me.lblRechnungAn.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: top; ddo-" &
+    "char-set: 1"
+        Me.lblRechnungAn.Text = "VERAG Spedition AG" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Abteilung: ZOLL" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Zusatz" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Suben Nr. 100" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "A 4975 SUBEN" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "ÖSTERRE" &
+    "ICH"
+        Me.lblRechnungAn.Top = 1.702362!
+        Me.lblRechnungAn.Width = 4.589763!
+        '
         'ReportFooter1
         '
         Me.ReportFooter1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Line8, Me.Line9, Me.lblSummeUeberschrift, Me.lblSteuerfreiGes, Me.lblSteuerpflichtigGes, Me.lblSumme, Me.Label46, Me.Line1, Me.Line5, Me.lblZWSumme, Me.lblSteuerbetrag, Me.lblSteuersatz, Me.txtVermerk, Me.txtInfo, Me.lblAnlagenUeberschrift, Me.txtAnlagen, Me.Line6, Me.Line7, Me.Line14, Me.lblZwText, Me.Line17, Me.txtHandlingATA, Me.lblHandlingATA, Me.TextBox1})
@@ -1593,10 +1538,6 @@ Partial Public Class rptRechnungDruck
         CType(Me.lblFirmenbuch, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblUIDUeberschrift, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblUID, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.lblRechnung_Name1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.lblRechnung_Name2, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.lblRechnung_Strasse, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.lblRechnung_Ort, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblEORIUeberschrift, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblEORI, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblRechnung_UID_Ueberschrift, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1606,9 +1547,9 @@ Partial Public Class rptRechnungDruck
         CType(Me.txtKdAuftragsNr_Ueberschrift, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.txtKdAuftragsNr, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblFirma, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.lblRechnung_Land, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.Label1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.Label2, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.lblRechnungAn, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblSummeUeberschrift, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblSteuerfreiGes, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblSteuerpflichtigGes, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1689,10 +1630,6 @@ Partial Public Class rptRechnungDruck
     Public WithEvents lblSachbearbeiter As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblFirmenbuch As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblUID As GrapeCity.ActiveReports.SectionReportModel.Label
-    Public WithEvents lblRechnung_Name1 As GrapeCity.ActiveReports.SectionReportModel.Label
-    Public WithEvents lblRechnung_Name2 As GrapeCity.ActiveReports.SectionReportModel.Label
-    Public WithEvents lblRechnung_Strasse As GrapeCity.ActiveReports.SectionReportModel.Label
-    Public WithEvents lblRechnung_Ort As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents txtAbsender As GrapeCity.ActiveReports.SectionReportModel.TextBox
     Public WithEvents txtEmpfaenger As GrapeCity.ActiveReports.SectionReportModel.TextBox
     Public WithEvents txtAvisierer As GrapeCity.ActiveReports.SectionReportModel.TextBox
@@ -1754,9 +1691,9 @@ Partial Public Class rptRechnungDruck
     Private WithEvents Line17 As GrapeCity.ActiveReports.SectionReportModel.Line
     Public WithEvents txtHandlingATA As GrapeCity.ActiveReports.SectionReportModel.TextBox
     Public WithEvents lblHandlingATA As GrapeCity.ActiveReports.SectionReportModel.Label
-    Public WithEvents lblRechnung_Land As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblWarenWertUeberschrift As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents Label2 As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents Label1 As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents TextBox1 As GrapeCity.ActiveReports.SectionReportModel.TextBox
+    Public WithEvents lblRechnungAn As GrapeCity.ActiveReports.SectionReportModel.Label
 End Class

SDL/Fakturierung/rptSammelRechnungAnlagenDruck.Designer.vb

@@ -60,19 +60,13 @@ Partial Public Class rptSammelRechnungAnlagenDruck
         Me.lblFirmenbuch = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblUIDUeberschrift = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblUID = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.lblRechnung_Name1 = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.lblRechnung_Name2 = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.lblRechnung_Strasse = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.lblRechnung_Ort = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblEORIUeberschrift = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblEORI = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblRechnung_UID_Ueberschrift = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblRechnung_UID = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblRechnung_Steuernummer_Ueberschrift = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblRechnung_Steuernummer = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.Line13 = New GrapeCity.ActiveReports.SectionReportModel.Line()
         Me.lblFirma = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.lblRechnung_Land = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.ReportFooter1 = New GrapeCity.ActiveReports.SectionReportModel.ReportFooter()
         Me.Line8 = New GrapeCity.ActiveReports.SectionReportModel.Line()
         Me.Line9 = New GrapeCity.ActiveReports.SectionReportModel.Line()
@@ -102,6 +96,8 @@ Partial Public Class rptSammelRechnungAnlagenDruck
         Me.Line15 = New GrapeCity.ActiveReports.SectionReportModel.Line()
         Me.Line17 = New GrapeCity.ActiveReports.SectionReportModel.Line()
         Me.GroupFooter4 = New GrapeCity.ActiveReports.SectionReportModel.GroupFooter()
+        Me.lblRechnungAn = New GrapeCity.ActiveReports.SectionReportModel.Label()
+        Me.Line13 = New GrapeCity.ActiveReports.SectionReportModel.Line()
         CType(Me.lblPosNr, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblDatum, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblSteuerfrei, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -136,10 +132,6 @@ Partial Public Class rptSammelRechnungAnlagenDruck
         CType(Me.lblFirmenbuch, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblUIDUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblUID, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.lblRechnung_Name1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.lblRechnung_Name2, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.lblRechnung_Strasse, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.lblRechnung_Ort, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblEORIUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblEORI, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblRechnung_UID_Ueberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -147,7 +139,6 @@ Partial Public Class rptSammelRechnungAnlagenDruck
         CType(Me.lblRechnung_Steuernummer_Ueberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblRechnung_Steuernummer, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblFirma, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.lblRechnung_Land, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblSummeUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblSteuerfreiGes, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblSteuerpflichtigGes, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -162,6 +153,7 @@ Partial Public Class rptSammelRechnungAnlagenDruck
         CType(Me.lblPosNrUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblSendungUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblSteuerfreiUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.lblRechnungAn, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me, System.ComponentModel.ISupportInitialize).BeginInit()
         '
         'PageHeader
@@ -383,7 +375,7 @@ Partial Public Class rptSammelRechnungAnlagenDruck
         '
         'ReportHeader1
         '
-        Me.ReportHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lblRgNr, Me.lblRgNrUeberschrift, Me.Picture1, Me.picVERAG, Me.lblKundenNrUeberschrift, Me.lblUeberschriftRG_GS, Me.lblKundenNr, Me.Line3, Me.lblFirmaOrt, Me.lblFirmaStrasse, Me.lblFirmaTel, Me.lblFirmaFax, Me.lblFirmaEmail, Me.lblFirmaWeb, Me.lblRgDatumUeberschrift, Me.lblRgDatum, Me.lblSachbearbeiterUeberschrift, Me.lblSachbearbeiter, Me.lblFirmenbuchUeberschrift, Me.lblFirmenbuch, Me.lblUIDUeberschrift, Me.lblUID, Me.lblRechnung_Name1, Me.lblRechnung_Name2, Me.lblRechnung_Strasse, Me.lblRechnung_Ort, Me.lblEORIUeberschrift, Me.lblEORI, Me.lblRechnung_UID_Ueberschrift, Me.lblRechnung_UID, Me.lblRechnung_Steuernummer_Ueberschrift, Me.lblRechnung_Steuernummer, Me.Line13, Me.lblFirma, Me.lblRechnung_Land})
+        Me.ReportHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lblRgNr, Me.lblRgNrUeberschrift, Me.Picture1, Me.picVERAG, Me.lblKundenNrUeberschrift, Me.lblUeberschriftRG_GS, Me.lblKundenNr, Me.Line3, Me.lblFirmaOrt, Me.lblFirmaStrasse, Me.lblFirmaTel, Me.lblFirmaFax, Me.lblFirmaEmail, Me.lblFirmaWeb, Me.lblRgDatumUeberschrift, Me.lblRgDatum, Me.lblSachbearbeiterUeberschrift, Me.lblSachbearbeiter, Me.lblFirmenbuchUeberschrift, Me.lblFirmenbuch, Me.lblUIDUeberschrift, Me.lblUID, Me.lblEORIUeberschrift, Me.lblEORI, Me.lblRechnung_UID_Ueberschrift, Me.lblRechnung_UID, Me.lblRechnung_Steuernummer_Ueberschrift, Me.lblRechnung_Steuernummer, Me.lblFirma, Me.lblRechnungAn, Me.Line13})
         Me.ReportHeader1.Height = 4.168913!
         Me.ReportHeader1.Name = "ReportHeader1"
         '
@@ -650,54 +642,6 @@ Partial Public Class rptSammelRechnungAnlagenDruck
         Me.lblUID.Top = 1.871653!
         Me.lblUID.Width = 1.958268!
         '
-        'lblRechnung_Name1
-        '
-        Me.lblRechnung_Name1.Height = 0.1771654!
-        Me.lblRechnung_Name1.HyperLink = Nothing
-        Me.lblRechnung_Name1.Left = 0.515!
-        Me.lblRechnung_Name1.Name = "lblRechnung_Name1"
-        Me.lblRechnung_Name1.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" &
-    "do-char-set: 1"
-        Me.lblRechnung_Name1.Text = "VERAG Spedition AG"
-        Me.lblRechnung_Name1.Top = 1.694!
-        Me.lblRechnung_Name1.Width = 4.589764!
-        '
-        'lblRechnung_Name2
-        '
-        Me.lblRechnung_Name2.Height = 0.1771653!
-        Me.lblRechnung_Name2.HyperLink = Nothing
-        Me.lblRechnung_Name2.Left = 0.515!
-        Me.lblRechnung_Name2.Name = "lblRechnung_Name2"
-        Me.lblRechnung_Name2.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" &
-    "do-char-set: 1"
-        Me.lblRechnung_Name2.Text = "Abteilung: ZOLL"
-        Me.lblRechnung_Name2.Top = 1.871165!
-        Me.lblRechnung_Name2.Width = 4.589763!
-        '
-        'lblRechnung_Strasse
-        '
-        Me.lblRechnung_Strasse.Height = 0.1771653!
-        Me.lblRechnung_Strasse.HyperLink = Nothing
-        Me.lblRechnung_Strasse.Left = 0.515!
-        Me.lblRechnung_Strasse.Name = "lblRechnung_Strasse"
-        Me.lblRechnung_Strasse.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" &
-    "do-char-set: 1"
-        Me.lblRechnung_Strasse.Text = "Suben Nr. 100"
-        Me.lblRechnung_Strasse.Top = 2.04833!
-        Me.lblRechnung_Strasse.Width = 4.589763!
-        '
-        'lblRechnung_Ort
-        '
-        Me.lblRechnung_Ort.Height = 0.1771653!
-        Me.lblRechnung_Ort.HyperLink = Nothing
-        Me.lblRechnung_Ort.Left = 0.5149997!
-        Me.lblRechnung_Ort.Name = "lblRechnung_Ort"
-        Me.lblRechnung_Ort.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" &
-    "do-char-set: 1"
-        Me.lblRechnung_Ort.Text = "A 4975 SUBEN"
-        Me.lblRechnung_Ort.Top = 2.225496!
-        Me.lblRechnung_Ort.Width = 4.589763!
-        '
         'lblEORIUeberschrift
         '
         Me.lblEORIUeberschrift.Height = 0.1574803!
@@ -770,19 +714,6 @@ Partial Public Class rptSammelRechnungAnlagenDruck
         Me.lblRechnung_Steuernummer.Top = 2.643308!
         Me.lblRechnung_Steuernummer.Width = 1.958268!
         '
-        'Line13
-        '
-        Me.Line13.Height = 0!
-        Me.Line13.Left = 0.515!
-        Me.Line13.LineWeight = 1.0!
-        Me.Line13.Name = "Line13"
-        Me.Line13.Top = 1.627071!
-        Me.Line13.Width = 3.619684!
-        Me.Line13.X1 = 0.515!
-        Me.Line13.X2 = 4.134684!
-        Me.Line13.Y1 = 1.627071!
-        Me.Line13.Y2 = 1.627071!
-        '
         'lblFirma
         '
         Me.lblFirma.Height = 0.1181102!
@@ -795,18 +726,6 @@ Partial Public Class rptSammelRechnungAnlagenDruck
         Me.lblFirma.Top = 1.473528!
         Me.lblFirma.Width = 3.619685!
         '
-        'lblRechnung_Land
-        '
-        Me.lblRechnung_Land.Height = 0.1771653!
-        Me.lblRechnung_Land.HyperLink = Nothing
-        Me.lblRechnung_Land.Left = 0.515!
-        Me.lblRechnung_Land.Name = "lblRechnung_Land"
-        Me.lblRechnung_Land.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" &
-    "do-char-set: 1"
-        Me.lblRechnung_Land.Text = "ÖSTERREICH"
-        Me.lblRechnung_Land.Top = 2.363291!
-        Me.lblRechnung_Land.Width = 4.589763!
-        '
         'ReportFooter1
         '
         Me.ReportFooter1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Line8, Me.Line9, Me.lblSummeUeberschrift, Me.lblSteuerfreiGes, Me.lblSteuerpflichtigGes, Me.lblSumme, Me.Label46, Me.Line1, Me.Line5, Me.lblZWSumme, Me.lblSteuerbetrag, Me.lblSteuersatz, Me.Line6, Me.Line7, Me.Line14, Me.lblZwText})
@@ -1151,6 +1070,32 @@ Partial Public Class rptSammelRechnungAnlagenDruck
         Me.GroupFooter4.Height = 0!
         Me.GroupFooter4.Name = "GroupFooter4"
         '
+        'lblRechnungAn
+        '
+        Me.lblRechnungAn.Height = 1.291339!
+        Me.lblRechnungAn.HyperLink = Nothing
+        Me.lblRechnungAn.Left = 0.514567!
+        Me.lblRechnungAn.Name = "lblRechnungAn"
+        Me.lblRechnungAn.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: top; ddo-" &
+    "char-set: 1"
+        Me.lblRechnungAn.Text = "VERAG Spedition AG" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Abteilung: ZOLL" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Zusatz" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Suben Nr. 100" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "A 4975 SUBEN" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "ÖSTERRE" &
+    "ICH"
+        Me.lblRechnungAn.Top = 1.714173!
+        Me.lblRechnungAn.Width = 4.589763!
+        '
+        'Line13
+        '
+        Me.Line13.Height = 0!
+        Me.Line13.Left = 0.5145669!
+        Me.Line13.LineWeight = 1.0!
+        Me.Line13.Name = "Line13"
+        Me.Line13.Top = 1.64685!
+        Me.Line13.Width = 3.619684!
+        Me.Line13.X1 = 0.5145669!
+        Me.Line13.X2 = 4.134251!
+        Me.Line13.Y1 = 1.64685!
+        Me.Line13.Y2 = 1.64685!
+        '
         'rptSammelRechnungAnlagenDruck
         '
         Me.PageSettings.Margins.Bottom = 0.3937008!
@@ -1207,10 +1152,6 @@ Partial Public Class rptSammelRechnungAnlagenDruck
         CType(Me.lblFirmenbuch, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblUIDUeberschrift, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblUID, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.lblRechnung_Name1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.lblRechnung_Name2, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.lblRechnung_Strasse, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.lblRechnung_Ort, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblEORIUeberschrift, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblEORI, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblRechnung_UID_Ueberschrift, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1218,7 +1159,6 @@ Partial Public Class rptSammelRechnungAnlagenDruck
         CType(Me.lblRechnung_Steuernummer_Ueberschrift, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblRechnung_Steuernummer, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblFirma, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.lblRechnung_Land, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblSummeUeberschrift, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblSteuerfreiGes, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblSteuerpflichtigGes, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1233,6 +1173,7 @@ Partial Public Class rptSammelRechnungAnlagenDruck
         CType(Me.lblPosNrUeberschrift, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblSendungUeberschrift, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblSteuerfreiUeberschrift, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.lblRechnungAn, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me, System.ComponentModel.ISupportInitialize).EndInit()
 
     End Sub
@@ -1271,10 +1212,6 @@ Partial Public Class rptSammelRechnungAnlagenDruck
     Public WithEvents lblSachbearbeiter As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblFirmenbuch As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblUID As GrapeCity.ActiveReports.SectionReportModel.Label
-    Public WithEvents lblRechnung_Name1 As GrapeCity.ActiveReports.SectionReportModel.Label
-    Public WithEvents lblRechnung_Name2 As GrapeCity.ActiveReports.SectionReportModel.Label
-    Public WithEvents lblRechnung_Strasse As GrapeCity.ActiveReports.SectionReportModel.Label
-    Public WithEvents lblRechnung_Ort As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblSteuerpflichtig As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblSteuerpflichtigGes As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblSumme As GrapeCity.ActiveReports.SectionReportModel.Label
@@ -1307,7 +1244,6 @@ Partial Public Class rptSammelRechnungAnlagenDruck
     Public WithEvents lblSummeUeberschrift As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblRgNrUeberschrift As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblZwText As GrapeCity.ActiveReports.SectionReportModel.Label
-    Private WithEvents Line13 As GrapeCity.ActiveReports.SectionReportModel.Line
     Private WithEvents Line15 As GrapeCity.ActiveReports.SectionReportModel.Line
     Private WithEvents Line17 As GrapeCity.ActiveReports.SectionReportModel.Line
     Private WithEvents lblLeistungsdatumUeberschrift As GrapeCity.ActiveReports.SectionReportModel.Label
@@ -1316,7 +1252,8 @@ Partial Public Class rptSammelRechnungAnlagenDruck
     Public WithEvents txtSendungsdetails As GrapeCity.ActiveReports.SectionReportModel.TextBox
     Public WithEvents lblFirma As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents txtPackstuecke As GrapeCity.ActiveReports.SectionReportModel.TextBox
-    Public WithEvents lblRechnung_Land As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents SubReport As GrapeCity.ActiveReports.SectionReportModel.SubReport
     Public WithEvents lblRgDatumUeberschrift As GrapeCity.ActiveReports.SectionReportModel.Label
+    Public WithEvents lblRechnungAn As GrapeCity.ActiveReports.SectionReportModel.Label
+    Private WithEvents Line13 As GrapeCity.ActiveReports.SectionReportModel.Line
 End Class

SDL/Fakturierung/rptSammelRechnungDruck.Designer.vb

@@ -56,10 +56,6 @@ Partial Public Class rptSammelRechnungDruck
         Me.lblFirmenbuch = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblUIDUeberschrift = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblUID = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.lblRechnung_Name1 = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.lblRechnung_Name2 = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.lblRechnung_Strasse = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.lblRechnung_Ort = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblEORIUeberschrift = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblEORI = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblRechnung_UID_Ueberschrift = New GrapeCity.ActiveReports.SectionReportModel.Label()
@@ -70,7 +66,7 @@ Partial Public Class rptSammelRechnungDruck
         Me.lblFirma = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblLKWIdUebeschrift = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblLKWId = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.lblRechnung_Land = New GrapeCity.ActiveReports.SectionReportModel.Label()
+        Me.lblRechnungAn = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.ReportFooter1 = New GrapeCity.ActiveReports.SectionReportModel.ReportFooter()
         Me.Line8 = New GrapeCity.ActiveReports.SectionReportModel.Line()
         Me.Line9 = New GrapeCity.ActiveReports.SectionReportModel.Line()
@@ -134,10 +130,6 @@ Partial Public Class rptSammelRechnungDruck
         CType(Me.lblFirmenbuch, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblUIDUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblUID, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.lblRechnung_Name1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.lblRechnung_Name2, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.lblRechnung_Strasse, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.lblRechnung_Ort, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblEORIUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblEORI, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblRechnung_UID_Ueberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -147,7 +139,7 @@ Partial Public Class rptSammelRechnungDruck
         CType(Me.lblFirma, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblLKWIdUebeschrift, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblLKWId, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.lblRechnung_Land, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.lblRechnungAn, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblSummeUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblSteuerfreiGes, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblSteuerpflichtigGes, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -342,7 +334,7 @@ Partial Public Class rptSammelRechnungDruck
         '
         'ReportHeader1
         '
-        Me.ReportHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lblRgNr, Me.lblRgNrUeberschrift, Me.Picture1, Me.picVERAG, Me.lblKundenNrUeberschrift, Me.lblUeberschriftRG_GS, Me.lblKundenNr, Me.Line3, Me.lblFirmaOrt, Me.lblFirmaStrasse, Me.lblFirmaTel, Me.lblFirmaFax, Me.lblFirmaEmail, Me.lblFirmaWeb, Me.lblRgDatumUeberschrift, Me.lblRgDatum, Me.lblSachbearbeiterUeberschrift, Me.lblSachbearbeiter, Me.lblFirmenbuchUeberschrift, Me.lblFirmenbuch, Me.lblUIDUeberschrift, Me.lblUID, Me.lblRechnung_Name1, Me.lblRechnung_Name2, Me.lblRechnung_Strasse, Me.lblRechnung_Ort, Me.lblEORIUeberschrift, Me.lblEORI, Me.lblRechnung_UID_Ueberschrift, Me.lblRechnung_UID, Me.lblRechnung_Steuernummer_Ueberschrift, Me.lblRechnung_Steuernummer, Me.Line13, Me.lblFirma, Me.lblLKWIdUebeschrift, Me.lblLKWId, Me.lblRechnung_Land})
+        Me.ReportHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lblRgNr, Me.lblRgNrUeberschrift, Me.Picture1, Me.picVERAG, Me.lblKundenNrUeberschrift, Me.lblUeberschriftRG_GS, Me.lblKundenNr, Me.Line3, Me.lblFirmaOrt, Me.lblFirmaStrasse, Me.lblFirmaTel, Me.lblFirmaFax, Me.lblFirmaEmail, Me.lblFirmaWeb, Me.lblRgDatumUeberschrift, Me.lblRgDatum, Me.lblSachbearbeiterUeberschrift, Me.lblSachbearbeiter, Me.lblFirmenbuchUeberschrift, Me.lblFirmenbuch, Me.lblUIDUeberschrift, Me.lblUID, Me.lblEORIUeberschrift, Me.lblEORI, Me.lblRechnung_UID_Ueberschrift, Me.lblRechnung_UID, Me.lblRechnung_Steuernummer_Ueberschrift, Me.lblRechnung_Steuernummer, Me.Line13, Me.lblFirma, Me.lblLKWIdUebeschrift, Me.lblLKWId, Me.lblRechnungAn})
         Me.ReportHeader1.Height = 4.168913!
         Me.ReportHeader1.Name = "ReportHeader1"
         '
@@ -609,54 +601,6 @@ Partial Public Class rptSammelRechnungDruck
         Me.lblUID.Top = 1.871653!
         Me.lblUID.Width = 1.958268!
         '
-        'lblRechnung_Name1
-        '
-        Me.lblRechnung_Name1.Height = 0.1771654!
-        Me.lblRechnung_Name1.HyperLink = Nothing
-        Me.lblRechnung_Name1.Left = 0.515!
-        Me.lblRechnung_Name1.Name = "lblRechnung_Name1"
-        Me.lblRechnung_Name1.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" &
-    "do-char-set: 1"
-        Me.lblRechnung_Name1.Text = "VERAG Spedition AG"
-        Me.lblRechnung_Name1.Top = 1.694!
-        Me.lblRechnung_Name1.Width = 3.592914!
-        '
-        'lblRechnung_Name2
-        '
-        Me.lblRechnung_Name2.Height = 0.1771653!
-        Me.lblRechnung_Name2.HyperLink = Nothing
-        Me.lblRechnung_Name2.Left = 0.515!
-        Me.lblRechnung_Name2.Name = "lblRechnung_Name2"
-        Me.lblRechnung_Name2.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" &
-    "do-char-set: 1"
-        Me.lblRechnung_Name2.Text = "Abteilung: ZOLL"
-        Me.lblRechnung_Name2.Top = 1.871165!
-        Me.lblRechnung_Name2.Width = 3.592913!
-        '
-        'lblRechnung_Strasse
-        '
-        Me.lblRechnung_Strasse.Height = 0.1771653!
-        Me.lblRechnung_Strasse.HyperLink = Nothing
-        Me.lblRechnung_Strasse.Left = 0.515!
-        Me.lblRechnung_Strasse.Name = "lblRechnung_Strasse"
-        Me.lblRechnung_Strasse.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" &
-    "do-char-set: 1"
-        Me.lblRechnung_Strasse.Text = "Suben Nr. 100"
-        Me.lblRechnung_Strasse.Top = 2.04833!
-        Me.lblRechnung_Strasse.Width = 3.592913!
-        '
-        'lblRechnung_Ort
-        '
-        Me.lblRechnung_Ort.Height = 0.1771653!
-        Me.lblRechnung_Ort.HyperLink = Nothing
-        Me.lblRechnung_Ort.Left = 0.5149997!
-        Me.lblRechnung_Ort.Name = "lblRechnung_Ort"
-        Me.lblRechnung_Ort.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" &
-    "do-char-set: 1"
-        Me.lblRechnung_Ort.Text = "A 4975 SUBEN"
-        Me.lblRechnung_Ort.Top = 2.225496!
-        Me.lblRechnung_Ort.Width = 3.592913!
-        '
         'lblEORIUeberschrift
         '
         Me.lblEORIUeberschrift.Height = 0.1574803!
@@ -778,17 +722,18 @@ Partial Public Class rptSammelRechnungDruck
         Me.lblLKWId.Top = 1.065354!
         Me.lblLKWId.Width = 1.958268!
         '
-        'lblRechnung_Land
+        'lblRechnungAn
         '
-        Me.lblRechnung_Land.Height = 0.1771653!
+        Me.lblRechnungAn.Height = 1.291339!
-        Me.lblRechnung_Land.HyperLink = Nothing
+        Me.lblRechnungAn.HyperLink = Nothing
-        Me.lblRechnung_Land.Left = 0.515!
+        Me.lblRechnungAn.Left = 0.514567!
-        Me.lblRechnung_Land.Name = "lblRechnung_Land"
+        Me.lblRechnungAn.Name = "lblRechnungAn"
-        Me.lblRechnung_Land.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" &
+        Me.lblRechnungAn.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: top; ddo-" &
-    "do-char-set: 1"
+    "char-set: 1"
-        Me.lblRechnung_Land.Text = "ÖSTERREICH"
+        Me.lblRechnungAn.Text = "VERAG Spedition AG" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Abteilung: ZOLL" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Zusatz" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Suben Nr. 100" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "A 4975 SUBEN" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "ÖSTERRE" &
-        Me.lblRechnung_Land.Top = 2.402661!
+    "ICH"
-        Me.lblRechnung_Land.Width = 4.589763!
+        Me.lblRechnungAn.Top = 1.676772!
+        Me.lblRechnungAn.Width = 4.589763!
         '
         'ReportFooter1
         '
@@ -1221,10 +1166,6 @@ Partial Public Class rptSammelRechnungDruck
         CType(Me.lblFirmenbuch, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblUIDUeberschrift, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblUID, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.lblRechnung_Name1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.lblRechnung_Name2, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.lblRechnung_Strasse, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.lblRechnung_Ort, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblEORIUeberschrift, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblEORI, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblRechnung_UID_Ueberschrift, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1234,7 +1175,7 @@ Partial Public Class rptSammelRechnungDruck
         CType(Me.lblFirma, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblLKWIdUebeschrift, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblLKWId, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.lblRechnung_Land, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.lblRechnungAn, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblSummeUeberschrift, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblSteuerfreiGes, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblSteuerpflichtigGes, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1290,10 +1231,6 @@ Partial Public Class rptSammelRechnungDruck
     Public WithEvents lblSachbearbeiter As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblFirmenbuch As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblUID As GrapeCity.ActiveReports.SectionReportModel.Label
-    Public WithEvents lblRechnung_Name1 As GrapeCity.ActiveReports.SectionReportModel.Label
-    Public WithEvents lblRechnung_Name2 As GrapeCity.ActiveReports.SectionReportModel.Label
-    Public WithEvents lblRechnung_Strasse As GrapeCity.ActiveReports.SectionReportModel.Label
-    Public WithEvents lblRechnung_Ort As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblSteuerpflichtig As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblSteuerpflichtigGes As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblSumme As GrapeCity.ActiveReports.SectionReportModel.Label
@@ -1335,8 +1272,8 @@ Partial Public Class rptSammelRechnungDruck
     Public WithEvents lblLKWIdUebeschrift As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblLKWId As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblFirma As GrapeCity.ActiveReports.SectionReportModel.Label
-    Public WithEvents lblRechnung_Land As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents Label2 As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents Label1 As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblRgDatumUeberschrift As GrapeCity.ActiveReports.SectionReportModel.Label
+    Public WithEvents lblRechnungAn As GrapeCity.ActiveReports.SectionReportModel.Label
 End Class

SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb

@@ -234,6 +234,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.lblEUR_4 = New System.Windows.Forms.Label()
         Me.Label55 = New System.Windows.Forms.Label()
         Me.cboSteuerschlüssel = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.rtbAbf_Besonderheiten = New SDL.usrCntlKundenBesonderheiten()
         Me.cbxOriginalPrint = New System.Windows.Forms.CheckBox()
         Me.Label46 = New System.Windows.Forms.Label()
         Me.Button9 = New System.Windows.Forms.Button()
@@ -273,7 +274,8 @@ Partial Class usrCntlFaktAbrechnung
         Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.GutschriftAusRechnungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.SeperateRechnungFürEUSTToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.rtbAbf_Besonderheiten = New SDL.usrCntlKundenBesonderheiten()
+        Me.txtRechnungAnZusatz = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label56 = New System.Windows.Forms.Label()
         Me.pnlTop.SuspendLayout()
         Me.Panel3.SuspendLayout()
         Me.Panel1.SuspendLayout()
@@ -305,7 +307,7 @@ Partial Class usrCntlFaktAbrechnung
         '
         Me.Label9.AutoSize = True
         Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label9.Location = New System.Drawing.Point(6, 19)
+        Me.Label9.Location = New System.Drawing.Point(6, 7)
         Me.Label9.Name = "Label9"
         Me.Label9.Size = New System.Drawing.Size(96, 15)
         Me.Label9.TabIndex = 0
@@ -1142,9 +1144,9 @@ Partial Class usrCntlFaktAbrechnung
         Me.pnlAvisierer.Controls.Add(Me.txtAvisoId)
         Me.pnlAvisierer.Controls.Add(Me.kdFirmaAvisierer)
         Me.pnlAvisierer.Controls.Add(Me.FlatButton5)
-        Me.pnlAvisierer.Location = New System.Drawing.Point(0, 367)
+        Me.pnlAvisierer.Location = New System.Drawing.Point(0, 373)
         Me.pnlAvisierer.Name = "pnlAvisierer"
-        Me.pnlAvisierer.Size = New System.Drawing.Size(415, 73)
+        Me.pnlAvisierer.Size = New System.Drawing.Size(415, 67)
         Me.pnlAvisierer.TabIndex = 8
         '
         'txtkdNrAvisierer
@@ -1180,7 +1182,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.Label27.AutoSize = True
         Me.Label27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold)
         Me.Label27.ForeColor = System.Drawing.Color.Red
-        Me.Label27.Location = New System.Drawing.Point(285, 38)
+        Me.Label27.Location = New System.Drawing.Point(285, 35)
         Me.Label27.Name = "Label27"
         Me.Label27.Size = New System.Drawing.Size(108, 13)
         Me.Label27.TabIndex = 7
@@ -1193,7 +1195,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.btnAvisiererEuro.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnAvisiererEuro.Font = New System.Drawing.Font("Arial Black", 18.0!, System.Drawing.FontStyle.Bold)
         Me.btnAvisiererEuro.ForeColor = System.Drawing.Color.Silver
-        Me.btnAvisiererEuro.Location = New System.Drawing.Point(8, 27)
+        Me.btnAvisiererEuro.Location = New System.Drawing.Point(8, 24)
         Me.btnAvisiererEuro.Margin = New System.Windows.Forms.Padding(2)
         Me.btnAvisiererEuro.Name = "btnAvisiererEuro"
         Me.btnAvisiererEuro.Size = New System.Drawing.Size(93, 37)
@@ -1206,7 +1208,7 @@ Partial Class usrCntlFaktAbrechnung
         '
         Me.Label2.AutoSize = True
         Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label2.Location = New System.Drawing.Point(99, 37)
+        Me.Label2.Location = New System.Drawing.Point(99, 34)
         Me.Label2.Name = "Label2"
         Me.Label2.Size = New System.Drawing.Size(48, 13)
         Me.Label2.TabIndex = 5
@@ -1237,7 +1239,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.txtAvisoId._Waehrung = False
         Me.txtAvisoId._WaehrungZeichen = True
         Me.txtAvisoId.ForeColor = System.Drawing.Color.Black
-        Me.txtAvisoId.Location = New System.Drawing.Point(157, 35)
+        Me.txtAvisoId.Location = New System.Drawing.Point(157, 32)
         Me.txtAvisoId.MaxLength = 35
         Me.txtAvisoId.MaxLineLength = -1
         Me.txtAvisoId.MaxLines_Warning = ""
@@ -1338,7 +1340,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.txtWarenwertUmrechnung._WaehrungZeichen = False
         Me.txtWarenwertUmrechnung.Enabled = False
         Me.txtWarenwertUmrechnung.ForeColor = System.Drawing.Color.Black
-        Me.txtWarenwertUmrechnung.Location = New System.Drawing.Point(562, 191)
+        Me.txtWarenwertUmrechnung.Location = New System.Drawing.Point(562, 197)
         Me.txtWarenwertUmrechnung.MaxLength = 35
         Me.txtWarenwertUmrechnung.MaxLineLength = -1
         Me.txtWarenwertUmrechnung.MaxLines_Warning = ""
@@ -1376,7 +1378,7 @@ Partial Class usrCntlFaktAbrechnung
         'Label34
         '
         Me.Label34.AutoSize = True
-        Me.Label34.Location = New System.Drawing.Point(422, 194)
+        Me.Label34.Location = New System.Drawing.Point(422, 200)
         Me.Label34.Name = "Label34"
         Me.Label34.Size = New System.Drawing.Size(71, 13)
         Me.Label34.TabIndex = 40
@@ -1412,7 +1414,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.txtVermerk._Waehrung = False
         Me.txtVermerk._WaehrungZeichen = True
         Me.txtVermerk.ForeColor = System.Drawing.Color.Black
-        Me.txtVermerk.Location = New System.Drawing.Point(517, 335)
+        Me.txtVermerk.Location = New System.Drawing.Point(517, 341)
         Me.txtVermerk.MaxLength = 35
         Me.txtVermerk.MaxLineLength = -1
         Me.txtVermerk.MaxLines_Warning = ""
@@ -1438,7 +1440,7 @@ Partial Class usrCntlFaktAbrechnung
         'Label25
         '
         Me.Label25.AutoSize = True
-        Me.Label25.Location = New System.Drawing.Point(422, 338)
+        Me.Label25.Location = New System.Drawing.Point(422, 344)
         Me.Label25.Name = "Label25"
         Me.Label25.Size = New System.Drawing.Size(49, 13)
         Me.Label25.TabIndex = 39
@@ -1474,7 +1476,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.txtErfassungsnummer._Waehrung = False
         Me.txtErfassungsnummer._WaehrungZeichen = True
         Me.txtErfassungsnummer.ForeColor = System.Drawing.Color.Black
-        Me.txtErfassungsnummer.Location = New System.Drawing.Point(517, 236)
+        Me.txtErfassungsnummer.Location = New System.Drawing.Point(517, 242)
         Me.txtErfassungsnummer.MaxLength = 35
         Me.txtErfassungsnummer.MaxLineLength = -1
         Me.txtErfassungsnummer.MaxLines_Warning = ""
@@ -1486,7 +1488,7 @@ Partial Class usrCntlFaktAbrechnung
         'Label24
         '
         Me.Label24.AutoSize = True
-        Me.Label24.Location = New System.Drawing.Point(422, 239)
+        Me.Label24.Location = New System.Drawing.Point(422, 245)
         Me.Label24.Name = "Label24"
         Me.Label24.Size = New System.Drawing.Size(79, 13)
         Me.Label24.TabIndex = 38
@@ -1590,7 +1592,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.pnlAuftraggeber.Controls.Add(Me.txtAuftragggeberOrt)
         Me.pnlAuftraggeber.Controls.Add(Me.txtAuftragggeberStrasse)
         Me.pnlAuftraggeber.Controls.Add(Me.FlatButton4)
-        Me.pnlAuftraggeber.Location = New System.Drawing.Point(0, 295)
+        Me.pnlAuftraggeber.Location = New System.Drawing.Point(0, 301)
         Me.pnlAuftraggeber.Name = "pnlAuftraggeber"
         Me.pnlAuftraggeber.Size = New System.Drawing.Size(415, 73)
         Me.pnlAuftraggeber.TabIndex = 7
@@ -1629,7 +1631,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.btnAuftraggeberEuro.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnAuftraggeberEuro.Font = New System.Drawing.Font("Arial Black", 18.0!, System.Drawing.FontStyle.Bold)
         Me.btnAuftraggeberEuro.ForeColor = System.Drawing.Color.Silver
-        Me.btnAuftraggeberEuro.Location = New System.Drawing.Point(7, 32)
+        Me.btnAuftraggeberEuro.Location = New System.Drawing.Point(7, 29)
         Me.btnAuftraggeberEuro.Margin = New System.Windows.Forms.Padding(2)
         Me.btnAuftraggeberEuro.Name = "btnAuftraggeberEuro"
         Me.btnAuftraggeberEuro.Size = New System.Drawing.Size(93, 37)
@@ -1801,7 +1803,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.txtBefoerderungsmittel._Waehrung = False
         Me.txtBefoerderungsmittel._WaehrungZeichen = True
         Me.txtBefoerderungsmittel.ForeColor = System.Drawing.Color.Black
-        Me.txtBefoerderungsmittel.Location = New System.Drawing.Point(517, 273)
+        Me.txtBefoerderungsmittel.Location = New System.Drawing.Point(517, 279)
         Me.txtBefoerderungsmittel.MaxLength = 35
         Me.txtBefoerderungsmittel.MaxLineLength = -1
         Me.txtBefoerderungsmittel.MaxLines_Warning = ""
@@ -1825,7 +1827,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.txtGrenze._Waehrung = False
         Me.txtGrenze._WaehrungZeichen = True
         Me.txtGrenze.ForeColor = System.Drawing.Color.Black
-        Me.txtGrenze.Location = New System.Drawing.Point(517, 254)
+        Me.txtGrenze.Location = New System.Drawing.Point(517, 260)
         Me.txtGrenze.MaxLength = 35
         Me.txtGrenze.MaxLineLength = -1
         Me.txtGrenze.MaxLines_Warning = ""
@@ -1837,7 +1839,7 @@ Partial Class usrCntlFaktAbrechnung
         'Label20
         '
         Me.Label20.AutoSize = True
-        Me.Label20.Location = New System.Drawing.Point(422, 276)
+        Me.Label20.Location = New System.Drawing.Point(422, 282)
         Me.Label20.Name = "Label20"
         Me.Label20.Size = New System.Drawing.Size(97, 13)
         Me.Label20.TabIndex = 20
@@ -1847,7 +1849,7 @@ Partial Class usrCntlFaktAbrechnung
         'Label19
         '
         Me.Label19.AutoSize = True
-        Me.Label19.Location = New System.Drawing.Point(422, 257)
+        Me.Label19.Location = New System.Drawing.Point(422, 263)
         Me.Label19.Name = "Label19"
         Me.Label19.Size = New System.Drawing.Size(44, 13)
         Me.Label19.TabIndex = 12
@@ -1869,7 +1871,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.txtSendungsdaten._Waehrung = False
         Me.txtSendungsdaten._WaehrungZeichen = True
         Me.txtSendungsdaten.ForeColor = System.Drawing.Color.Black
-        Me.txtSendungsdaten.Location = New System.Drawing.Point(517, 317)
+        Me.txtSendungsdaten.Location = New System.Drawing.Point(517, 323)
         Me.txtSendungsdaten.MaxLength = 300
         Me.txtSendungsdaten.MaxLineLength = -1
         Me.txtSendungsdaten.MaxLines_Warning = ""
@@ -1881,7 +1883,7 @@ Partial Class usrCntlFaktAbrechnung
         'Label17
         '
         Me.Label17.AutoSize = True
-        Me.Label17.Location = New System.Drawing.Point(422, 320)
+        Me.Label17.Location = New System.Drawing.Point(422, 326)
         Me.Label17.Name = "Label17"
         Me.Label17.Size = New System.Drawing.Size(85, 13)
         Me.Label17.TabIndex = 21
@@ -1903,7 +1905,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.txtWarenwert._Waehrung = True
         Me.txtWarenwert._WaehrungZeichen = False
         Me.txtWarenwert.ForeColor = System.Drawing.Color.Black
-        Me.txtWarenwert.Location = New System.Drawing.Point(562, 172)
+        Me.txtWarenwert.Location = New System.Drawing.Point(562, 178)
         Me.txtWarenwert.MaxLength = 35
         Me.txtWarenwert.MaxLineLength = -1
         Me.txtWarenwert.MaxLines_Warning = ""
@@ -1916,7 +1918,7 @@ Partial Class usrCntlFaktAbrechnung
         'Label16
         '
         Me.Label16.AutoSize = True
-        Me.Label16.Location = New System.Drawing.Point(422, 175)
+        Me.Label16.Location = New System.Drawing.Point(422, 181)
         Me.Label16.Name = "Label16"
         Me.Label16.Size = New System.Drawing.Size(62, 13)
         Me.Label16.TabIndex = 13
@@ -1938,7 +1940,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.txtZollbelegNr._Waehrung = False
         Me.txtZollbelegNr._WaehrungZeichen = True
         Me.txtZollbelegNr.ForeColor = System.Drawing.Color.Black
-        Me.txtZollbelegNr.Location = New System.Drawing.Point(517, 153)
+        Me.txtZollbelegNr.Location = New System.Drawing.Point(517, 159)
         Me.txtZollbelegNr.MaxLength = 35
         Me.txtZollbelegNr.MaxLineLength = -1
         Me.txtZollbelegNr.MaxLines_Warning = ""
@@ -1950,7 +1952,7 @@ Partial Class usrCntlFaktAbrechnung
         'Label10
         '
         Me.Label10.AutoSize = True
-        Me.Label10.Location = New System.Drawing.Point(422, 156)
+        Me.Label10.Location = New System.Drawing.Point(422, 162)
         Me.Label10.Name = "Label10"
         Me.Label10.Size = New System.Drawing.Size(70, 13)
         Me.Label10.TabIndex = 9
@@ -1961,6 +1963,8 @@ Partial Class usrCntlFaktAbrechnung
         '
         Me.pnlRechnungAn.BackColor = System.Drawing.Color.PapayaWhip
         Me.pnlRechnungAn.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.pnlRechnungAn.Controls.Add(Me.Label56)
+        Me.pnlRechnungAn.Controls.Add(Me.txtRechnungAnZusatz)
         Me.pnlRechnungAn.Controls.Add(Me.Button15)
         Me.pnlRechnungAn.Controls.Add(Me.cboSammelrechnung)
         Me.pnlRechnungAn.Controls.Add(Me.Button14)
@@ -1990,14 +1994,14 @@ Partial Class usrCntlFaktAbrechnung
         Me.pnlRechnungAn.Controls.Add(Me.Label7)
         Me.pnlRechnungAn.Location = New System.Drawing.Point(0, 0)
         Me.pnlRechnungAn.Name = "pnlRechnungAn"
-        Me.pnlRechnungAn.Size = New System.Drawing.Size(582, 146)
+        Me.pnlRechnungAn.Size = New System.Drawing.Size(582, 153)
         Me.pnlRechnungAn.TabIndex = 0
         '
         'Button15
         '
         Me.Button15.Enabled = False
         Me.Button15.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button15.Location = New System.Drawing.Point(518, 98)
+        Me.Button15.Location = New System.Drawing.Point(518, 105)
         Me.Button15.Name = "Button15"
         Me.Button15.Size = New System.Drawing.Size(57, 23)
         Me.Button15.TabIndex = 241
@@ -2010,7 +2014,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.cboSammelrechnung._allowFreiText = False
         Me.cboSammelrechnung._value = ""
         Me.cboSammelrechnung.FormattingEnabled = True
-        Me.cboSammelrechnung.Location = New System.Drawing.Point(282, 17)
+        Me.cboSammelrechnung.Location = New System.Drawing.Point(282, 5)
         Me.cboSammelrechnung.Name = "cboSammelrechnung"
         Me.cboSammelrechnung.Size = New System.Drawing.Size(102, 21)
         Me.cboSammelrechnung.TabIndex = 2
@@ -2021,7 +2025,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.Button14.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.Button14.FlatAppearance.BorderSize = 0
         Me.Button14.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button14.Location = New System.Drawing.Point(383, 9)
+        Me.Button14.Location = New System.Drawing.Point(383, -3)
         Me.Button14.Name = "Button14"
         Me.Button14.Size = New System.Drawing.Size(25, 25)
         Me.Button14.TabIndex = 240
@@ -2035,7 +2039,7 @@ Partial Class usrCntlFaktAbrechnung
         '
         Me.picKdAuftrInfo.BackgroundImage = Global.SDL.My.Resources.Resources.warning2
         Me.picKdAuftrInfo.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.picKdAuftrInfo.Location = New System.Drawing.Point(7, 116)
+        Me.picKdAuftrInfo.Location = New System.Drawing.Point(7, 123)
         Me.picKdAuftrInfo.Name = "picKdAuftrInfo"
         Me.picKdAuftrInfo.Size = New System.Drawing.Size(20, 20)
         Me.picKdAuftrInfo.TabIndex = 87
@@ -2047,7 +2051,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.lblKdInaktiv.AutoSize = True
         Me.lblKdInaktiv.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold)
         Me.lblKdInaktiv.ForeColor = System.Drawing.Color.Red
-        Me.lblKdInaktiv.Location = New System.Drawing.Point(6, 63)
+        Me.lblKdInaktiv.Location = New System.Drawing.Point(6, 51)
         Me.lblKdInaktiv.Name = "lblKdInaktiv"
         Me.lblKdInaktiv.Size = New System.Drawing.Size(64, 13)
         Me.lblKdInaktiv.TabIndex = 22
@@ -2058,7 +2062,7 @@ Partial Class usrCntlFaktAbrechnung
         '
         Me.picWarnRgAn.BackgroundImage = Global.SDL.My.Resources.Resources.warning2
         Me.picWarnRgAn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.picWarnRgAn.Location = New System.Drawing.Point(80, 58)
+        Me.picWarnRgAn.Location = New System.Drawing.Point(80, 46)
         Me.picWarnRgAn.Name = "picWarnRgAn"
         Me.picWarnRgAn.Size = New System.Drawing.Size(20, 20)
         Me.picWarnRgAn.TabIndex = 86
@@ -2070,7 +2074,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.lblUIDOK.AutoSize = True
         Me.lblUIDOK.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold)
         Me.lblUIDOK.ForeColor = System.Drawing.Color.Green
-        Me.lblUIDOK.Location = New System.Drawing.Point(431, 124)
+        Me.lblUIDOK.Location = New System.Drawing.Point(431, 131)
         Me.lblUIDOK.Name = "lblUIDOK"
         Me.lblUIDOK.Size = New System.Drawing.Size(104, 13)
         Me.lblUIDOK.TabIndex = 21
@@ -2082,7 +2086,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.lblUIDErr.AutoSize = True
         Me.lblUIDErr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold)
         Me.lblUIDErr.ForeColor = System.Drawing.Color.Red
-        Me.lblUIDErr.Location = New System.Drawing.Point(431, 124)
+        Me.lblUIDErr.Location = New System.Drawing.Point(431, 131)
         Me.lblUIDErr.Name = "lblUIDErr"
         Me.lblUIDErr.Size = New System.Drawing.Size(122, 13)
         Me.lblUIDErr.TabIndex = 8
@@ -2093,7 +2097,7 @@ Partial Class usrCntlFaktAbrechnung
         '
         Me.Button6.Enabled = False
         Me.Button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button6.Location = New System.Drawing.Point(434, 98)
+        Me.Button6.Location = New System.Drawing.Point(434, 105)
         Me.Button6.Name = "Button6"
         Me.Button6.Size = New System.Drawing.Size(85, 23)
         Me.Button6.TabIndex = 15
@@ -2115,7 +2119,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.txtRechnungAnName2._Waehrung = False
         Me.txtRechnungAnName2._WaehrungZeichen = True
         Me.txtRechnungAnName2.ForeColor = System.Drawing.Color.Black
-        Me.txtRechnungAnName2.Location = New System.Drawing.Point(101, 56)
+        Me.txtRechnungAnName2.Location = New System.Drawing.Point(101, 44)
         Me.txtRechnungAnName2.MaxLength = 40
         Me.txtRechnungAnName2.MaxLineLength = -1
         Me.txtRechnungAnName2.MaxLines_Warning = ""
@@ -2144,7 +2148,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.kdFirmaRechnungAn.KdNr = "-1"
         Me.kdFirmaRechnungAn.kdNrField = Nothing
         Me.kdFirmaRechnungAn.KdNrNullInt = Nothing
-        Me.kdFirmaRechnungAn.Location = New System.Drawing.Point(101, 37)
+        Me.kdFirmaRechnungAn.Location = New System.Drawing.Point(101, 25)
         Me.kdFirmaRechnungAn.MaxLength = 35
         Me.kdFirmaRechnungAn.Name = "kdFirmaRechnungAn"
         Me.kdFirmaRechnungAn.nurAktive = True
@@ -2162,7 +2166,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.FlatButton3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.FlatButton3.ForeColor = System.Drawing.Color.Black
         Me.FlatButton3.Image = Global.SDL.My.Resources.Resources.personInaktiv
-        Me.FlatButton3.Location = New System.Drawing.Point(383, 32)
+        Me.FlatButton3.Location = New System.Drawing.Point(383, 20)
         Me.FlatButton3.Name = "FlatButton3"
         Me.FlatButton3.Size = New System.Drawing.Size(24, 25)
         Me.FlatButton3.TabIndex = 7
@@ -2184,7 +2188,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.txtKdAuftragsNr._Waehrung = False
         Me.txtKdAuftragsNr._WaehrungZeichen = True
         Me.txtKdAuftragsNr.ForeColor = System.Drawing.Color.Black
-        Me.txtKdAuftragsNr.Location = New System.Drawing.Point(101, 116)
+        Me.txtKdAuftragsNr.Location = New System.Drawing.Point(101, 123)
         Me.txtKdAuftragsNr.MaxLength = 35
         Me.txtKdAuftragsNr.MaxLineLength = -1
         Me.txtKdAuftragsNr.MaxLines_Warning = ""
@@ -2197,7 +2201,7 @@ Partial Class usrCntlFaktAbrechnung
         '
         Me.Label43.AutoSize = True
         Me.Label43.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label43.Location = New System.Drawing.Point(30, 119)
+        Me.Label43.Location = New System.Drawing.Point(30, 126)
         Me.Label43.Name = "Label43"
         Me.Label43.Size = New System.Drawing.Size(65, 13)
         Me.Label43.TabIndex = 19
@@ -2218,7 +2222,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.txtRechnungAnUIDKz._Waehrung = False
         Me.txtRechnungAnUIDKz._WaehrungZeichen = True
         Me.txtRechnungAnUIDKz.ForeColor = System.Drawing.Color.Black
-        Me.txtRechnungAnUIDKz.Location = New System.Drawing.Point(481, 56)
+        Me.txtRechnungAnUIDKz.Location = New System.Drawing.Point(481, 44)
         Me.txtRechnungAnUIDKz.MaxLength = 35
         Me.txtRechnungAnUIDKz.MaxLineLength = -1
         Me.txtRechnungAnUIDKz.MaxLines_Warning = ""
@@ -2232,7 +2236,7 @@ Partial Class usrCntlFaktAbrechnung
         '
         Me.lblVorauskasse.AutoSize = True
         Me.lblVorauskasse.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblVorauskasse.Location = New System.Drawing.Point(537, 20)
+        Me.lblVorauskasse.Location = New System.Drawing.Point(537, 8)
         Me.lblVorauskasse.Name = "lblVorauskasse"
         Me.lblVorauskasse.Size = New System.Drawing.Size(37, 13)
         Me.lblVorauskasse.TabIndex = 6
@@ -2242,7 +2246,7 @@ Partial Class usrCntlFaktAbrechnung
         'Label1
         '
         Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(431, 20)
+        Me.Label1.Location = New System.Drawing.Point(431, 8)
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(71, 13)
         Me.Label1.TabIndex = 4
@@ -2255,7 +2259,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.cboRechnungAn._allowFreiText = False
         Me.cboRechnungAn._value = ""
         Me.cboRechnungAn.FormattingEnabled = True
-        Me.cboRechnungAn.Location = New System.Drawing.Point(101, 17)
+        Me.cboRechnungAn.Location = New System.Drawing.Point(101, 5)
         Me.cboRechnungAn.Name = "cboRechnungAn"
         Me.cboRechnungAn.Size = New System.Drawing.Size(183, 21)
         Me.cboRechnungAn.TabIndex = 1
@@ -2275,7 +2279,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.txtRechnungAnUIDNr._Waehrung = False
         Me.txtRechnungAnUIDNr._WaehrungZeichen = True
         Me.txtRechnungAnUIDNr.ForeColor = System.Drawing.Color.Black
-        Me.txtRechnungAnUIDNr.Location = New System.Drawing.Point(506, 56)
+        Me.txtRechnungAnUIDNr.Location = New System.Drawing.Point(506, 44)
         Me.txtRechnungAnUIDNr.MaxLength = 35
         Me.txtRechnungAnUIDNr.MaxLineLength = -1
         Me.txtRechnungAnUIDNr.MaxLines_Warning = ""
@@ -2289,7 +2293,7 @@ Partial Class usrCntlFaktAbrechnung
         '
         Me.Label6.AutoSize = True
         Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label6.Location = New System.Drawing.Point(431, 59)
+        Me.Label6.Location = New System.Drawing.Point(431, 47)
         Me.Label6.Name = "Label6"
         Me.Label6.Size = New System.Drawing.Size(46, 13)
         Me.Label6.TabIndex = 12
@@ -2310,7 +2314,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.txtRechnungAnBuKdNr._Waehrung = False
         Me.txtRechnungAnBuKdNr._WaehrungZeichen = True
         Me.txtRechnungAnBuKdNr.ForeColor = System.Drawing.Color.Black
-        Me.txtRechnungAnBuKdNr.Location = New System.Drawing.Point(481, 37)
+        Me.txtRechnungAnBuKdNr.Location = New System.Drawing.Point(481, 25)
         Me.txtRechnungAnBuKdNr.MaxLength = 35
         Me.txtRechnungAnBuKdNr.MaxLineLength = -1
         Me.txtRechnungAnBuKdNr.MaxLines_Warning = ""
@@ -2324,7 +2328,7 @@ Partial Class usrCntlFaktAbrechnung
         '
         Me.Label3.AutoSize = True
         Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label3.Location = New System.Drawing.Point(431, 40)
+        Me.Label3.Location = New System.Drawing.Point(431, 28)
         Me.Label3.Name = "Label3"
         Me.Label3.Size = New System.Drawing.Size(47, 13)
         Me.Label3.TabIndex = 9
@@ -2345,7 +2349,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.txtkdNrRechnungAn._Waehrung = False
         Me.txtkdNrRechnungAn._WaehrungZeichen = True
         Me.txtkdNrRechnungAn.ForeColor = System.Drawing.Color.Black
-        Me.txtkdNrRechnungAn.Location = New System.Drawing.Point(8, 37)
+        Me.txtkdNrRechnungAn.Location = New System.Drawing.Point(8, 25)
         Me.txtkdNrRechnungAn.MaxLength = 35
         Me.txtkdNrRechnungAn.MaxLineLength = -1
         Me.txtkdNrRechnungAn.MaxLines_Warning = ""
@@ -2370,7 +2374,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.txtRechnungAnOrt._Waehrung = False
         Me.txtRechnungAnOrt._WaehrungZeichen = True
         Me.txtRechnungAnOrt.ForeColor = System.Drawing.Color.Black
-        Me.txtRechnungAnOrt.Location = New System.Drawing.Point(101, 94)
+        Me.txtRechnungAnOrt.Location = New System.Drawing.Point(101, 101)
         Me.txtRechnungAnOrt.MaxLength = 52
         Me.txtRechnungAnOrt.MaxLineLength = -1
         Me.txtRechnungAnOrt.MaxLines_Warning = ""
@@ -2395,7 +2399,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.txtRechnungAnStrasse._Waehrung = False
         Me.txtRechnungAnStrasse._WaehrungZeichen = True
         Me.txtRechnungAnStrasse.ForeColor = System.Drawing.Color.Black
-        Me.txtRechnungAnStrasse.Location = New System.Drawing.Point(101, 75)
+        Me.txtRechnungAnStrasse.Location = New System.Drawing.Point(101, 82)
         Me.txtRechnungAnStrasse.MaxLength = 40
         Me.txtRechnungAnStrasse.MaxLineLength = -1
         Me.txtRechnungAnStrasse.MaxLines_Warning = ""
@@ -2408,7 +2412,7 @@ Partial Class usrCntlFaktAbrechnung
         'Label7
         '
         Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label7.Location = New System.Drawing.Point(408, 78)
+        Me.Label7.Location = New System.Drawing.Point(408, 85)
         Me.Label7.Name = "Label7"
         Me.Label7.Size = New System.Drawing.Size(167, 13)
         Me.Label7.TabIndex = 16
@@ -2427,7 +2431,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.pnlAbsender.Controls.Add(Me.txtAbsenderOrt)
         Me.pnlAbsender.Controls.Add(Me.txtAbsenderStrasse)
         Me.pnlAbsender.Controls.Add(Me.FlatButton1)
-        Me.pnlAbsender.Location = New System.Drawing.Point(0, 145)
+        Me.pnlAbsender.Location = New System.Drawing.Point(0, 151)
         Me.pnlAbsender.Name = "pnlAbsender"
         Me.pnlAbsender.Size = New System.Drawing.Size(415, 77)
         Me.pnlAbsender.TabIndex = 5
@@ -2466,7 +2470,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.btnAbsenderEuro.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnAbsenderEuro.Font = New System.Drawing.Font("Arial Black", 18.0!, System.Drawing.FontStyle.Bold)
         Me.btnAbsenderEuro.ForeColor = System.Drawing.Color.Silver
-        Me.btnAbsenderEuro.Location = New System.Drawing.Point(7, 30)
+        Me.btnAbsenderEuro.Location = New System.Drawing.Point(7, 29)
         Me.btnAbsenderEuro.Margin = New System.Windows.Forms.Padding(0)
         Me.btnAbsenderEuro.Name = "btnAbsenderEuro"
         Me.btnAbsenderEuro.Size = New System.Drawing.Size(93, 37)
@@ -3116,7 +3120,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.cboWaehrung._allowFreiText = False
         Me.cboWaehrung._value = ""
         Me.cboWaehrung.FormattingEnabled = True
-        Me.cboWaehrung.Location = New System.Drawing.Point(517, 171)
+        Me.cboWaehrung.Location = New System.Drawing.Point(517, 177)
         Me.cboWaehrung.Name = "cboWaehrung"
         Me.cboWaehrung.Size = New System.Drawing.Size(47, 21)
         Me.cboWaehrung.TabIndex = 14
@@ -3128,7 +3132,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.cboWaehrungUmrechnung._value = ""
         Me.cboWaehrungUmrechnung.Enabled = False
         Me.cboWaehrungUmrechnung.FormattingEnabled = True
-        Me.cboWaehrungUmrechnung.Location = New System.Drawing.Point(517, 190)
+        Me.cboWaehrungUmrechnung.Location = New System.Drawing.Point(517, 196)
         Me.cboWaehrungUmrechnung.Name = "cboWaehrungUmrechnung"
         Me.cboWaehrungUmrechnung.Size = New System.Drawing.Size(47, 21)
         Me.cboWaehrungUmrechnung.TabIndex = 17
@@ -3145,7 +3149,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.pnlEmpfaenger.Controls.Add(Me.txtEmpfaengerStrasse)
         Me.pnlEmpfaenger.Controls.Add(Me.kdFirmaEmpfaenger)
         Me.pnlEmpfaenger.Controls.Add(Me.FlatButton2)
-        Me.pnlEmpfaenger.Location = New System.Drawing.Point(0, 221)
+        Me.pnlEmpfaenger.Location = New System.Drawing.Point(0, 227)
         Me.pnlEmpfaenger.Name = "pnlEmpfaenger"
         Me.pnlEmpfaenger.Size = New System.Drawing.Size(415, 75)
         Me.pnlEmpfaenger.TabIndex = 6
@@ -3437,6 +3441,17 @@ Partial Class usrCntlFaktAbrechnung
         Me.cboSteuerschlüssel.Size = New System.Drawing.Size(145, 21)
         Me.cboSteuerschlüssel.TabIndex = 3
         '
+        'rtbAbf_Besonderheiten
+        '
+        Me.rtbAbf_Besonderheiten.BackColor = System.Drawing.Color.White
+        Me.rtbAbf_Besonderheiten.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.rtbAbf_Besonderheiten.Location = New System.Drawing.Point(10, 19)
+        Me.rtbAbf_Besonderheiten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.rtbAbf_Besonderheiten.Name = "rtbAbf_Besonderheiten"
+        Me.rtbAbf_Besonderheiten.Size = New System.Drawing.Size(107, 133)
+        Me.rtbAbf_Besonderheiten.TabIndex = 235
+        Me.rtbAbf_Besonderheiten.Visible = False
+        '
         'cbxOriginalPrint
         '
         Me.cbxOriginalPrint.AutoSize = True
@@ -3892,16 +3907,40 @@ Partial Class usrCntlFaktAbrechnung
         Me.SeperateRechnungFürEUSTToolStripMenuItem.Size = New System.Drawing.Size(223, 22)
         Me.SeperateRechnungFürEUSTToolStripMenuItem.Text = "Seperate Rechnung für EUST"
         '
-        'rtbAbf_Besonderheiten
+        'txtRechnungAnZusatz
         '
-        Me.rtbAbf_Besonderheiten.BackColor = System.Drawing.Color.White
+        Me.txtRechnungAnZusatz._DateTimeOnly = False
-        Me.rtbAbf_Besonderheiten.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.txtRechnungAnZusatz._numbersOnly = False
-        Me.rtbAbf_Besonderheiten.Location = New System.Drawing.Point(10, 19)
+        Me.txtRechnungAnZusatz._numbersOnlyKommastellen = ""
-        Me.rtbAbf_Besonderheiten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.txtRechnungAnZusatz._numbersOnlyTrennzeichen = True
-        Me.rtbAbf_Besonderheiten.Name = "rtbAbf_Besonderheiten"
+        Me.txtRechnungAnZusatz._Prozent = False
-        Me.rtbAbf_Besonderheiten.Size = New System.Drawing.Size(107, 133)
+        Me.txtRechnungAnZusatz._ShortDateNew = False
-        Me.rtbAbf_Besonderheiten.TabIndex = 235
+        Me.txtRechnungAnZusatz._ShortDateOnly = False
-        Me.rtbAbf_Besonderheiten.Visible = False
+        Me.txtRechnungAnZusatz._TimeOnly = False
+        Me.txtRechnungAnZusatz._TimeOnly_Seconds = False
+        Me.txtRechnungAnZusatz._value = Nothing
+        Me.txtRechnungAnZusatz._Waehrung = False
+        Me.txtRechnungAnZusatz._WaehrungZeichen = True
+        Me.txtRechnungAnZusatz.ForeColor = System.Drawing.Color.Black
+        Me.txtRechnungAnZusatz.Location = New System.Drawing.Point(101, 63)
+        Me.txtRechnungAnZusatz.MaxLength = 52
+        Me.txtRechnungAnZusatz.MaxLineLength = -1
+        Me.txtRechnungAnZusatz.MaxLines_Warning = ""
+        Me.txtRechnungAnZusatz.MaxLines_Warning_Label = Nothing
+        Me.txtRechnungAnZusatz.Name = "txtRechnungAnZusatz"
+        Me.txtRechnungAnZusatz.Size = New System.Drawing.Size(306, 20)
+        Me.txtRechnungAnZusatz.TabIndex = 242
+        Me.txtRechnungAnZusatz.TabStop = False
+        '
+        'Label56
+        '
+        Me.Label56.AutoSize = True
+        Me.Label56.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label56.Location = New System.Drawing.Point(7, 85)
+        Me.Label56.Name = "Label56"
+        Me.Label56.Size = New System.Drawing.Size(48, 13)
+        Me.Label56.TabIndex = 243
+        Me.Label56.Text = "Adresse:"
         '
         'usrCntlFaktAbrechnung
         '
@@ -4182,4 +4221,6 @@ Partial Class usrCntlFaktAbrechnung
     Friend WithEvents ContextMenuStrip2 As ContextMenuStrip
     Friend WithEvents GutschriftAusRechnungToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents SeperateRechnungFürEUSTToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents Label56 As Label
+    Friend WithEvents txtRechnungAnZusatz As VERAG_PROG_ALLGEMEIN.MyTextBox
 End Class

SDL/Fakturierung/usrCntlFaktAbrechnung.vb

@@ -208,6 +208,7 @@ Public Class usrCntlFaktAbrechnung
             End If
             txtRechnungAnStrasse.Text = If(RECHNUNG.RechnungsStraße, "")
             txtRechnungAnOrt.Text = If(RECHNUNG.RechnungsOrt, "")
+            txtRechnungAnZusatz.Text = If(RECHNUNG.RechnungsName_AdressZusatz, "")
 
             If RECHNUNG.AbsenderKundenNr IsNot Nothing AndAlso RECHNUNG.AbsenderKundenNr > 0 Then
                 kdFirmaAbsender.KdNr = RECHNUNG.AbsenderKundenNr
@@ -757,9 +758,12 @@ Public Class usrCntlFaktAbrechnung
 
             If kdFirmaRechnungAn.KdNr_value > 0 And kdFirmaRechnungAn.KdData_ADRESSEN IsNot Nothing Then
                 Dim AD As VERAG_PROG_ALLGEMEIN.cAdressen = kdFirmaRechnungAn.KdData_ADRESSEN
+                Dim KD_ERW As VERAG_PROG_ALLGEMEIN.cKundenErweitert = kdFirmaRechnungAn.KdData_KUNDE_ERW
                 txtRechnungAnName2.Text = If(AD.Name_2, "")
                 txtRechnungAnStrasse.Text = If(AD.Straße, "")
                 txtRechnungAnOrt.Text = (If(AD.LandKz, "") & " " & If(AD.PLZ, "") & " " & If(AD.Ort, "")).trim
+                If KD_ERW IsNot Nothing Then txtRechnungAnZusatz.Text = If(KD_ERW.kde_AdressZusatz, "") Else txtRechnungAnZusatz.Text = ""
+
                 txtRechnungAnUIDNr.Text = If(AD.UstIdNr, "")
                 txtRechnungAnUIDKz.Text = If(AD.UstIdKz, "")
                 Label7.Text = If(AD.UstIdGeprüft IsNot Nothing, "geprüft am: " & AD.UstIdGeprüft, "-")
@@ -856,6 +860,7 @@ Public Class usrCntlFaktAbrechnung
                 txtRechnungAnName2.Text = txtAbsenderName2.Text
                 txtRechnungAnStrasse.Text = txtAbsenderStrasse.Text
                 txtRechnungAnOrt.Text = txtAbsenderOrt.Text
+                If kdFirmaAbsender.KdData_KUNDE_ERW IsNot Nothing Then txtRechnungAnZusatz.Text = If(kdFirmaAbsender.KdData_KUNDE_ERW.kde_AdressZusatz, "") Else txtRechnungAnZusatz.Text = ""
                 If kdFirmaAbsender.KdData_KUNDE IsNot Nothing Then
                     cboSteuerschlüssel.changeItem(If(kdFirmaAbsender.KdData_KUNDE.Steuerschlüssel, ""))
                     cboSammelrechnung.changeItem(If(kdFirmaAbsender.KdData_KUNDE.Sammelrechnung, ""))
@@ -868,6 +873,7 @@ Public Class usrCntlFaktAbrechnung
                 txtRechnungAnName2.Text = txtEmpfeangerName2.Text
                 txtRechnungAnStrasse.Text = txtEmpfaengerStrasse.Text
                 txtRechnungAnOrt.Text = txtEmpfaengerOrt.Text
+                If kdFirmaEmpfaenger.KdData_KUNDE_ERW IsNot Nothing Then txtRechnungAnZusatz.Text = If(kdFirmaEmpfaenger.KdData_KUNDE_ERW.kde_AdressZusatz, "") Else txtRechnungAnZusatz.Text = ""
                 If kdFirmaEmpfaenger.KdData_KUNDE IsNot Nothing Then
                     cboSteuerschlüssel.changeItem(If(kdFirmaEmpfaenger.KdData_KUNDE.Steuerschlüssel, ""))
                     cboSammelrechnung.changeItem(If(kdFirmaEmpfaenger.KdData_KUNDE.Sammelrechnung, ""))
@@ -879,6 +885,7 @@ Public Class usrCntlFaktAbrechnung
                 txtRechnungAnName2.Text = txtAuftraggeberName2.Text
                 txtRechnungAnStrasse.Text = txtAuftragggeberStrasse.Text
                 txtRechnungAnOrt.Text = txtAuftragggeberOrt.Text
+                If kdFirmaAuftraggeber.KdData_KUNDE_ERW IsNot Nothing Then txtRechnungAnZusatz.Text = If(kdFirmaAuftraggeber.KdData_KUNDE_ERW.kde_AdressZusatz, "") Else txtRechnungAnZusatz.Text = ""
                 If kdFirmaAuftraggeber.KdData_KUNDE IsNot Nothing Then
                     cboSteuerschlüssel.changeItem(If(kdFirmaAuftraggeber.KdData_KUNDE.Steuerschlüssel, ""))
                     cboSammelrechnung.changeItem(If(kdFirmaAuftraggeber.KdData_KUNDE.Sammelrechnung, ""))
@@ -887,6 +894,7 @@ Public Class usrCntlFaktAbrechnung
             Case "4"
                 kdFirmaRechnungAn.KdNr = kdFirmaAvisierer.KdNr
                 If kdFirmaRechnungAn.KdNrNullInt <= 0 Then kdFirmaRechnungAn.Text = kdFirmaAvisierer.Text
+                If kdFirmaAvisierer.KdData_KUNDE_ERW IsNot Nothing Then txtRechnungAnZusatz.Text = If(kdFirmaAvisierer.KdData_KUNDE_ERW.kde_AdressZusatz, "") Else txtRechnungAnZusatz.Text = ""
                 If kdFirmaAvisierer.KdData_KUNDE IsNot Nothing Then
                     cboSteuerschlüssel.changeItem(If(kdFirmaAvisierer.KdData_KUNDE.Steuerschlüssel, ""))
                     cboSammelrechnung.changeItem(If(kdFirmaAvisierer.KdData_KUNDE.Sammelrechnung, ""))
@@ -1840,6 +1848,7 @@ Public Class usrCntlFaktAbrechnung
         End If
         RECHNUNG.RechnungsStraße = cProgramFunctions.isLeerNothing(txtRechnungAnStrasse.Text)
         RECHNUNG.RechnungsOrt = cProgramFunctions.isLeerNothing(txtRechnungAnOrt.Text)
+        RECHNUNG.RechnungsName_AdressZusatz = (txtRechnungAnZusatz.Text)
         RECHNUNG.RechnungsUstIdKz = cProgramFunctions.isLeerNothing(txtRechnungAnUIDKz.Text)
         RECHNUNG.RechnungsUstIdNr = cProgramFunctions.isLeerNothing(txtRechnungAnUIDNr.Text)
         If kdFirmaRechnungAn.KdData_ADRESSEN IsNot Nothing Then
@@ -3794,9 +3803,8 @@ Nächste_Textzeile_lesen:
             For Each R_POS In REM_POS_TMP
                 RECHNUNG_TMP.POSITIONEN.Remove(R_POS)
             Next
-
             initDGVRechnungenPositionen()
-            ' RECHNUNG_TMP.SAVE_POSITIONEN(RECHNUNG_TMP.RK_ID)
+            RECHNUNG_TMP.SAVE_POSITIONEN(RECHNUNG_TMP.RK_ID)
             saveMe()
 
 

SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.vb

@@ -281,7 +281,7 @@
                         DataGridView.Rows.Add(cnt, "750", "2 % Kreditaufwendung (von Einfuhrabgaben)", "") : cnt += 1
 
 
-                        dgvZusatzleistung.Rows.Add("", "347", "Clearingkosten (EINMALIG nur bei 1. Abfertigung)", CDbl(80).ToString("C2"))
+                        dgvZusatzleistung.Rows.Add("", "347", "Compliance Check (EINMALIG nur bei 1. Abfertigung)", CDbl(80).ToString("C2"))
                         dgvZusatzleistung.Rows.Add("", "", "Korr. Rechnung anfordern", CDbl(25).ToString("C2"))
                         dgvZusatzleistung.Rows.Add("", "380", "Übersetzung Rechnung", CDbl(1.5).ToString("C2") & "/min")
 
@@ -297,21 +297,21 @@
                         DataGridView.Rows.Add(cnt, "700", "1 % Vorlageprovision (von Einfuhrabgaben)", "") : cnt += 1
                         DataGridView.Rows.Add(cnt, "750", "2 % Kreditaufwendung (von Einfuhrabgaben)", "") : cnt += 1
 
-                        dgvZusatzleistung.Rows.Add("", "347", "Clearingkosten (EINMALIG nur bei 1. Abfertigung)", CDbl(80).ToString("C2"))
+                        dgvZusatzleistung.Rows.Add("", "347", "Compliance Check (EINMALIG nur bei 1. Abfertigung)", CDbl(80).ToString("C2"))
 
 
                 End Select
             Case "AMBAR"
                 Select Case MyComboBox1._value
                     Case "VZ"
-                        DataGridView.Rows.Add(cnt, "", "Verzollung (inkl. 1 Tarifnummer)", CDbl(93).ToString("C2")) : cnt += 1
+                        DataGridView.Rows.Add(cnt, "", "Verzollung (inkl. 1 Tarifnummer)", CDbl(112).ToString("C2")) : cnt += 1
-                        DataGridView.Rows.Add(cnt, "", "je weitere Tarifnummer", CDbl(6).ToString("C2")) : cnt += 1
+                        DataGridView.Rows.Add(cnt, "", "je weitere Tarifnummer", CDbl(7.5).ToString("C2")) : cnt += 1
                         DataGridView.Rows.Add(cnt, "", "Aviso", CDbl(20).ToString("C2")) : cnt += 1
-                        DataGridView.Rows.Add(cnt, "440", "Fixe Taxe", CDbl(12).ToString("C2")) : cnt += 1
+                        DataGridView.Rows.Add(cnt, "440", "Fixe Taxe", CDbl(15).ToString("C2")) : cnt += 1
                         DataGridView.Rows.Add(cnt, "440", "Papiere Porti", CDbl(10).ToString("C2")) : cnt += 1
                         DataGridView.Rows.Add(cnt, "440", "Sonstige Kosten*", CDbl(40).ToString("C2")) : cnt += 1
                         DataGridView.Rows.Add(cnt, "260", "SVS", "lt. Tabelle") : cnt += 1
-                        DataGridView.Rows.Add(cnt, "324", "ATLAS (DE) Zuschlag", CDbl(8).ToString("C2")) : cnt += 1
+                        DataGridView.Rows.Add(cnt, "324", "ATLAS (DE) Zuschlag", CDbl(10).ToString("C2")) : cnt += 1
                         DataGridView.Rows.Add(cnt, "700", "1 % Vorlageprovision (von Einfuhrabgaben)", "") : cnt += 1
                         DataGridView.Rows.Add(cnt, "750", "2 % Kreditaufwendung (von Einfuhrabgaben)", "") : cnt += 1
 
@@ -329,14 +329,14 @@
                         'dgvZusatzleistung.Rows.Add("", "", "VERAG Warenort", CDbl(60).ToString("C2"))
 
                     Case "VZ_RW" ' 
-                        DataGridView.Rows.Add(cnt, "", "Verzollung (inkl. 1 Tarifnummer)", CDbl(150).ToString("C2")) : cnt += 1
+                        DataGridView.Rows.Add(cnt, "", "Verzollung (inkl. 1 Tarifnummer)", CDbl(169).ToString("C2")) : cnt += 1
-                        DataGridView.Rows.Add(cnt, "", "je weitere Tarifnummer", CDbl(6).ToString("C2")) : cnt += 1
+                        DataGridView.Rows.Add(cnt, "", "je weitere Tarifnummer", CDbl(7.5).ToString("C2")) : cnt += 1
                         DataGridView.Rows.Add(cnt, "", "Aviso", CDbl(20).ToString("C2")) : cnt += 1
-                        DataGridView.Rows.Add(cnt, "440", "Fixe Taxe", CDbl(12).ToString("C2")) : cnt += 1
+                        DataGridView.Rows.Add(cnt, "440", "Fixe Taxe", CDbl(15).ToString("C2")) : cnt += 1
                         DataGridView.Rows.Add(cnt, "440", "Papiere Porti", CDbl(10).ToString("C2")) : cnt += 1
                         DataGridView.Rows.Add(cnt, "440", "Sonstige Kosten*", CDbl(40).ToString("C2")) : cnt += 1
                         DataGridView.Rows.Add(cnt, "260", "SVS", "lt. Tabelle") : cnt += 1
-                        DataGridView.Rows.Add(cnt, "324", "ATLAS (DE) Zuschlag", CDbl(8).ToString("C2")) : cnt += 1
+                        DataGridView.Rows.Add(cnt, "324", "ATLAS (DE) Zuschlag", CDbl(10).ToString("C2")) : cnt += 1
                         DataGridView.Rows.Add(cnt, "700", "1 % Vorlageprovision (von Einfuhrabgaben)", "") : cnt += 1
                         DataGridView.Rows.Add(cnt, "750", "2 % Kreditaufwendung (von Einfuhrabgaben)", "") : cnt += 1
 
@@ -368,14 +368,14 @@
                         DataGridView.Rows.Add(cnt, "", "T1/T2 Abfertigung", CDbl(60).ToString("C2")) : cnt += 1
 
                     Case "VZ_SPECIAL_1" '"VZ Gemüse,Arznei,Lebensmittel"
-                        DataGridView.Rows.Add(cnt, "", "Verzollung (inkl. 1 Tarifnummer)", CDbl(139).ToString("C2")) : cnt += 1
+                        DataGridView.Rows.Add(cnt, "", "Verzollung (inkl. 1 Tarifnummer)", CDbl(158).ToString("C2")) : cnt += 1
                         DataGridView.Rows.Add(cnt, "", "je weitere Tarifnummer", CDbl(18).ToString("C2")) : cnt += 1
                         DataGridView.Rows.Add(cnt, "", "Aviso", CDbl(20).ToString("C2")) : cnt += 1
-                        DataGridView.Rows.Add(cnt, "440", "Fixe Taxe", CDbl(12).ToString("C2")) : cnt += 1
+                        DataGridView.Rows.Add(cnt, "440", "Fixe Taxe", CDbl(15).ToString("C2")) : cnt += 1
                         DataGridView.Rows.Add(cnt, "440", "Papiere Porti", CDbl(10).ToString("C2")) : cnt += 1
                         DataGridView.Rows.Add(cnt, "440", "Sonstige Kosten*", CDbl(40).ToString("C2")) : cnt += 1
                         DataGridView.Rows.Add(cnt, "260", "SVS", "lt. Tabelle") : cnt += 1
-                        DataGridView.Rows.Add(cnt, "324", "ATLAS (DE) Zuschlag", CDbl(8).ToString("C2")) : cnt += 1
+                        DataGridView.Rows.Add(cnt, "324", "ATLAS (DE) Zuschlag", CDbl(10).ToString("C2")) : cnt += 1
                         DataGridView.Rows.Add(cnt, "700", "1 % Vorlageprovision (von Einfuhrabgaben)", "") : cnt += 1
                         DataGridView.Rows.Add(cnt, "750", "2 % Kreditaufwendung (von Einfuhrabgaben)", "") : cnt += 1
 
@@ -391,9 +391,9 @@
                     Case "EUST"
 
                         DataGridView.Rows.Add(cnt, "", "EUST", "lt. Steuerbescheid") : cnt += 1
-                        DataGridView.Rows.Add(cnt, "440", "Fixe Taxe", CDbl(12).ToString("C2")) : cnt += 1
+                        DataGridView.Rows.Add(cnt, "440", "Fixe Taxe", CDbl(15).ToString("C2")) : cnt += 1
                         DataGridView.Rows.Add(cnt, "260", "SVS", "lt. Tabelle") : cnt += 1
-                        DataGridView.Rows.Add(cnt, "324", "ATLAS (DE) Zuschlag", CDbl(8).ToString("C2")) : cnt += 1
+                        DataGridView.Rows.Add(cnt, "324", "ATLAS (DE) Zuschlag", CDbl(10).ToString("C2")) : cnt += 1
                         DataGridView.Rows.Add(cnt, "700", "1 % Vorlageprovision (von Einfuhrabgaben)", "") : cnt += 1
                         DataGridView.Rows.Add(cnt, "750", "2 % Kreditaufwendung (von Einfuhrabgaben)", "") : cnt += 1
 

SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.vb

@@ -707,8 +707,8 @@
     Sub setDefault()
         Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
             Case "AMBAR"
-                txtVerzollungskosten._value = 93
+                txtVerzollungskosten._value = 112
-                txtATLAS._value = 8
+                txtATLAS._value = 10
                 '  txtClearing._value = 40
                 txtClearing._value = 0
                 txtAviso._value = 20

SDL/Formulare/KDFormulare/frmFormulare.vb

@@ -2120,7 +2120,7 @@ Public Class FormularManagerNEU
 
 
                                               Dim ZOLLANMELDUNG As New DAKOSY_Worker.cZollsysteme_Aktenbeschriftung
-                                              ZOLLANMELDUNG.getDataByBezugsnummer(SND.FilialenNr & "/" & SND.AbfertigungsNr, SND.tblSnd_Abfertigungsart_ID.ToString, SND.tblSnd_DakosyRef) ' Die weiteren Daten werden hier geladen
+                                              ZOLLANMELDUNG.getDataByBezugsnummer(SND.FilialenNr & "/" & SND.AbfertigungsNr, SND.tblSnd_Abfertigungsart_ID.ToString, SND.tblSnd_DakosyRef, AVISO.Grenzstelle) ' Die weiteren Daten werden hier geladen
 
 
 

SDL/SMS/frmSMS.Designer.vb

@@ -43,7 +43,7 @@ Partial Class frmSMS
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
         Me.Name = "frmSMS"
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
-        Me.Text = "SDL Abholung"
+        Me.Text = "SMS Übersicht"
         Me.ResumeLayout(False)
 
     End Sub

SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb

@@ -580,7 +580,7 @@ Public Class frmNacherfassungNEU
             Case "IMEX" : cboFiliale._allowedValuesFreiText = {"5501"} : where = " AND mit_firma IN ('IMEX','BEIDE') "
             Case "UNISPED" : cboFiliale._allowedValuesFreiText = {"5601"} : where = " AND mit_firma IN ('UNISPED','BEIDE') "
             Case "FRONTOFFICE" : where = " AND mit_firma NOT IN ('ATILLA') "
-            Case "ATILLA" : cboFiliale._allowedValuesFreiText = {"4801"}
+            Case "ATILLA" : cboFiliale._allowedValuesFreiText = {"4801", "4802"}
             Case "VERIMEX" : cboFiliale._allowedValuesFreiText = {"6001"}
             Case Else : where = " AND mit_firma NOT IN ('IMEX','UNISPED','AMBAR','FRONTOFFICE') "
         End Select
@@ -1748,8 +1748,9 @@ Class cSpedBuch_Aktendeckel
                 End Select
             End If
 
+
             Dim ZOLLANMELDUNG As New DAKOSY_Worker.cZollsysteme_Aktenbeschriftung
-            If Not ZOLLANMELDUNG.getDataByBezugsnummer(SPEDBUCH.FilialenNr & "/" & SPEDBUCH.AbfertigungsNr, SPEDBUCH.Abfertigungsart.ToString, (If(SPEDBUCH.AtlasBezNrEZA, "") & If(SPEDBUCH.AtlasBezNrNCTS, "")).Trim) Then
+            If Not ZOLLANMELDUNG.getDataByBezugsnummer(SPEDBUCH.FilialenNr & "/" & SPEDBUCH.AbfertigungsNr, SPEDBUCH.Abfertigungsart.ToString, (If(SPEDBUCH.AtlasBezNrEZA, "") & If(SPEDBUCH.AtlasBezNrNCTS, "")).Trim, SPEDBUCH.Grenzstelle) Then
                 ZOLLANMELDUNG = Nothing
             End If
 

SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb

@@ -443,6 +443,11 @@ Public Class usrCntlSpeditionsBuchSuche
         'lstGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("???", "???"))
         lstGrenze.Items.Clear()
         lstGrenze.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where [grz_Firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' AND grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO")
+
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then
+            lstGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SUB", "SUB"))
+            lstGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("NEU", "NEU"))
+        End If
         lstGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("???", "???"))
         lstGrenze.changeItem("")
 
@@ -1947,7 +1952,7 @@ Public Class usrCntlSpeditionsBuchSuche
                         Blatt.Range("H" & cnt).Value = r("BelegNr")
 
                         Dim ZOLLANMELDUNG As New DAKOSY_Worker.cZollsysteme_Aktenbeschriftung
-                        If ZOLLANMELDUNG.getDataByBezugsnummer(r("FilialenNr") & "/" & r("AbfertigungsNr"), r("Abfertigungsart"), "") Then
+                        If ZOLLANMELDUNG.getDataByBezugsnummer(r("FilialenNr") & "/" & r("AbfertigungsNr"), r("Abfertigungsart"), "", False) Then
                             Blatt.Range("F" & cnt).Value = ZOLLANMELDUNG.Rechnungspreis
                             Blatt.Range("G" & cnt).Value = ZOLLANMELDUNG.Handelsrechnung.Replace(", ", "," & vbNewLine)
                             Blatt.Range("I" & cnt).Value = ZOLLANMELDUNG.ABGABEN_ZOLL

SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS.vb

@@ -563,6 +563,7 @@ Public Class usrCntlATLAS_NCTS
                 ncts_OUT.ncts_LetzteBearbeitung_SB = DY_ANM.dy_LetzteBearbeitung_SB
                 ncts_OUT.ncts_firma = Me.FIRMA_DY
                 DAKOSY_Interface_SEND.loadInClass_VersandanmeldungNCTSDE_003(ncts_OUT, Me, DY_ANM, Me.FIRMA_DY)
+
                 If Not ncts_OUT.SAVE_ALL() Then Exit Sub
 
                 Dim saveFile = ""

SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_SicherheitPos.Designer.vb

@@ -47,6 +47,7 @@ Partial Class usrCntlATLAS_ncts_SicherheitPos
         Me.FlowLayoutPanel = New System.Windows.Forms.FlowLayoutPanel()
         Me.btnBrgUNISPED_AT = New System.Windows.Forms.Button()
         Me.btnBrgUNISPED_DE = New System.Windows.Forms.Button()
+        Me.btnBRG_IMEX_AT = New System.Windows.Forms.Button()
         Me.FlowLayoutPanel.SuspendLayout()
         Me.SuspendLayout()
         '
@@ -54,7 +55,7 @@ Partial Class usrCntlATLAS_ncts_SicherheitPos
         '
         Me.Label8.AutoSize = True
         Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label8.Location = New System.Drawing.Point(12, 10)
+        Me.Label8.Location = New System.Drawing.Point(5, 10)
         Me.Label8.Name = "Label8"
         Me.Label8.Size = New System.Drawing.Size(132, 13)
         Me.Label8.TabIndex = 57
@@ -65,10 +66,12 @@ Partial Class usrCntlATLAS_ncts_SicherheitPos
         Me.txtAbgabenbetrag._DateTimeOnly = False
         Me.txtAbgabenbetrag._numbersOnly = False
         Me.txtAbgabenbetrag._numbersOnlyKommastellen = ""
+        Me.txtAbgabenbetrag._numbersOnlyTrennzeichen = True
         Me.txtAbgabenbetrag._Prozent = False
         Me.txtAbgabenbetrag._ShortDateNew = False
         Me.txtAbgabenbetrag._ShortDateOnly = False
         Me.txtAbgabenbetrag._TimeOnly = False
+        Me.txtAbgabenbetrag._TimeOnly_Seconds = False
         Me.txtAbgabenbetrag._value = Nothing
         Me.txtAbgabenbetrag._Waehrung = True
         Me.txtAbgabenbetrag._WaehrungZeichen = True
@@ -111,10 +114,12 @@ Partial Class usrCntlATLAS_ncts_SicherheitPos
         Me.txtBezeichnung._DateTimeOnly = False
         Me.txtBezeichnung._numbersOnly = False
         Me.txtBezeichnung._numbersOnlyKommastellen = ""
+        Me.txtBezeichnung._numbersOnlyTrennzeichen = True
         Me.txtBezeichnung._Prozent = False
         Me.txtBezeichnung._ShortDateNew = False
         Me.txtBezeichnung._ShortDateOnly = False
         Me.txtBezeichnung._TimeOnly = False
+        Me.txtBezeichnung._TimeOnly_Seconds = False
         Me.txtBezeichnung._value = Nothing
         Me.txtBezeichnung._Waehrung = False
         Me.txtBezeichnung._WaehrungZeichen = True
@@ -148,20 +153,21 @@ Partial Class usrCntlATLAS_ncts_SicherheitPos
         Me.txtZugriffscode._DateTimeOnly = False
         Me.txtZugriffscode._numbersOnly = False
         Me.txtZugriffscode._numbersOnlyKommastellen = ""
+        Me.txtZugriffscode._numbersOnlyTrennzeichen = False
         Me.txtZugriffscode._Prozent = False
         Me.txtZugriffscode._ShortDateNew = False
         Me.txtZugriffscode._ShortDateOnly = False
         Me.txtZugriffscode._TimeOnly = False
+        Me.txtZugriffscode._TimeOnly_Seconds = False
         Me.txtZugriffscode._value = Nothing
         Me.txtZugriffscode._Waehrung = False
-        Me.txtZugriffscode._WaehrungZeichen = True
+        Me.txtZugriffscode._WaehrungZeichen = False
         Me.txtZugriffscode.ForeColor = System.Drawing.Color.Black
         Me.txtZugriffscode.Location = New System.Drawing.Point(545, 104)
         Me.txtZugriffscode.MaxLineLength = -1
         Me.txtZugriffscode.MaxLines_Warning = ""
         Me.txtZugriffscode.MaxLines_Warning_Label = Nothing
         Me.txtZugriffscode.Name = "txtZugriffscode"
-        Me.txtZugriffscode.PasswordChar = Global.Microsoft.VisualBasic.ChrW(42)
         Me.txtZugriffscode.Size = New System.Drawing.Size(363, 20)
         Me.txtZugriffscode.TabIndex = 73
         '
@@ -186,10 +192,12 @@ Partial Class usrCntlATLAS_ncts_SicherheitPos
         Me.txtGRN._DateTimeOnly = False
         Me.txtGRN._numbersOnly = False
         Me.txtGRN._numbersOnlyKommastellen = ""
+        Me.txtGRN._numbersOnlyTrennzeichen = True
         Me.txtGRN._Prozent = False
         Me.txtGRN._ShortDateNew = False
         Me.txtGRN._ShortDateOnly = False
         Me.txtGRN._TimeOnly = False
+        Me.txtGRN._TimeOnly_Seconds = False
         Me.txtGRN._value = Nothing
         Me.txtGRN._Waehrung = False
         Me.txtGRN._WaehrungZeichen = True
@@ -210,7 +218,7 @@ Partial Class usrCntlATLAS_ncts_SicherheitPos
         Me.btnBrgSGS.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold)
         Me.btnBrgSGS.ForeColor = System.Drawing.Color.Black
         Me.btnBrgSGS.ImageAlign = System.Drawing.ContentAlignment.TopCenter
-        Me.btnBrgSGS.Location = New System.Drawing.Point(2, 44)
+        Me.btnBrgSGS.Location = New System.Drawing.Point(466, 2)
         Me.btnBrgSGS.Margin = New System.Windows.Forms.Padding(2)
         Me.btnBrgSGS.Name = "btnBrgSGS"
         Me.btnBrgSGS.Size = New System.Drawing.Size(60, 38)
@@ -223,10 +231,12 @@ Partial Class usrCntlATLAS_ncts_SicherheitPos
         Me.txtEORI_TIN._DateTimeOnly = False
         Me.txtEORI_TIN._numbersOnly = False
         Me.txtEORI_TIN._numbersOnlyKommastellen = ""
+        Me.txtEORI_TIN._numbersOnlyTrennzeichen = True
         Me.txtEORI_TIN._Prozent = False
         Me.txtEORI_TIN._ShortDateNew = False
         Me.txtEORI_TIN._ShortDateOnly = False
         Me.txtEORI_TIN._TimeOnly = False
+        Me.txtEORI_TIN._TimeOnly_Seconds = False
         Me.txtEORI_TIN._value = Nothing
         Me.txtEORI_TIN._Waehrung = False
         Me.txtEORI_TIN._WaehrungZeichen = True
@@ -247,7 +257,7 @@ Partial Class usrCntlATLAS_ncts_SicherheitPos
         Me.btnBrgSonstige.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold)
         Me.btnBrgSonstige.ForeColor = System.Drawing.Color.Black
         Me.btnBrgSonstige.ImageAlign = System.Drawing.ContentAlignment.TopCenter
-        Me.btnBrgSonstige.Location = New System.Drawing.Point(130, 44)
+        Me.btnBrgSonstige.Location = New System.Drawing.Point(66, 44)
         Me.btnBrgSonstige.Margin = New System.Windows.Forms.Padding(2)
         Me.btnBrgSonstige.Name = "btnBrgSonstige"
         Me.btnBrgSonstige.Size = New System.Drawing.Size(80, 38)
@@ -356,7 +366,7 @@ Partial Class usrCntlATLAS_ncts_SicherheitPos
         Me.btnEKOL.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold)
         Me.btnEKOL.ForeColor = System.Drawing.Color.Black
         Me.btnEKOL.ImageAlign = System.Drawing.ContentAlignment.TopCenter
-        Me.btnEKOL.Location = New System.Drawing.Point(66, 44)
+        Me.btnEKOL.Location = New System.Drawing.Point(2, 44)
         Me.btnEKOL.Margin = New System.Windows.Forms.Padding(2)
         Me.btnEKOL.Name = "btnEKOL"
         Me.btnEKOL.Size = New System.Drawing.Size(60, 38)
@@ -375,9 +385,10 @@ Partial Class usrCntlATLAS_ncts_SicherheitPos
         Me.FlowLayoutPanel.Controls.Add(Me.btnBrgSGS)
         Me.FlowLayoutPanel.Controls.Add(Me.btnEKOL)
         Me.FlowLayoutPanel.Controls.Add(Me.btnBrgSonstige)
-        Me.FlowLayoutPanel.Location = New System.Drawing.Point(13, 24)
+        Me.FlowLayoutPanel.Controls.Add(Me.btnBRG_IMEX_AT)
+        Me.FlowLayoutPanel.Location = New System.Drawing.Point(6, 24)
         Me.FlowLayoutPanel.Name = "FlowLayoutPanel"
-        Me.FlowLayoutPanel.Size = New System.Drawing.Size(518, 53)
+        Me.FlowLayoutPanel.Size = New System.Drawing.Size(538, 53)
         Me.FlowLayoutPanel.TabIndex = 79
         '
         'btnBrgUNISPED_AT
@@ -414,6 +425,22 @@ Partial Class usrCntlATLAS_ncts_SicherheitPos
         Me.btnBrgUNISPED_DE.UseVisualStyleBackColor = False
         Me.btnBrgUNISPED_DE.Visible = False
         '
+        'btnBRG_IMEX_AT
+        '
+        Me.btnBRG_IMEX_AT.BackColor = System.Drawing.Color.White
+        Me.btnBRG_IMEX_AT.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center
+        Me.btnBRG_IMEX_AT.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnBRG_IMEX_AT.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold)
+        Me.btnBRG_IMEX_AT.ForeColor = System.Drawing.Color.Black
+        Me.btnBRG_IMEX_AT.ImageAlign = System.Drawing.ContentAlignment.TopCenter
+        Me.btnBRG_IMEX_AT.Location = New System.Drawing.Point(150, 44)
+        Me.btnBRG_IMEX_AT.Margin = New System.Windows.Forms.Padding(2)
+        Me.btnBRG_IMEX_AT.Name = "btnBRG_IMEX_AT"
+        Me.btnBRG_IMEX_AT.Size = New System.Drawing.Size(80, 38)
+        Me.btnBRG_IMEX_AT.TabIndex = 81
+        Me.btnBRG_IMEX_AT.Text = "IMEX (AT)"
+        Me.btnBRG_IMEX_AT.UseVisualStyleBackColor = False
+        '
         'usrCntlATLAS_ncts_SicherheitPos
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -467,4 +494,5 @@ Partial Class usrCntlATLAS_ncts_SicherheitPos
     Friend WithEvents FlowLayoutPanel As FlowLayoutPanel
     Friend WithEvents btnBrgUNISPED_AT As Button
     Friend WithEvents btnBrgUNISPED_DE As Button
+    Friend WithEvents btnBRG_IMEX_AT As Button
 End Class

SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_SicherheitPos.vb

@@ -1,5 +1,5 @@
 Public Class usrCntlATLAS_ncts_SicherheitPos
-    Property ncts_ART = "T-"
+    Property ncts_ART = "" '"T-"
     Public Event CHANGED()
     Dim FIRMA_DY = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
     Sub New(FIRMA_DY)
@@ -30,6 +30,7 @@
                 btnBrgUNISPED_DE.Visible = True
                 btnBrgVERAG_AT.Visible = False
                 btnBrgVERAG_DE.Visible = False
+                btnBRG_IMEX_AT.Visible = False
         End Select
     End Sub
 
@@ -53,6 +54,7 @@
             Case "17DE0000000071678" : setBtn(btnBrgVERAG_DE, True)
             Case "05AT500000G000EU9" : setBtn(btnBrgUNISPED_AT, True)
             Case "17DE0000000071270" : setBtn(btnBrgUNISPED_DE, True)
+            Case "16AT520000G000VA6" : setBtn(btnBRG_IMEX_AT, True)
             Case Else : setBtn(btnBrgSonstige, True)
         End Select
 
@@ -87,6 +89,7 @@
         setBtn(btnBrgUNISPED_DE, False)
 
         'If resetControls Then
+
         cboArtSicherheit.changeItem("")
         txtGRN.Text = ""
         txtEORI_TIN.Text = ""
@@ -100,8 +103,9 @@
             txtGRN.Text = "05AT510000G000FP7"
             txtEORI_TIN.Text = "ATEOS1000000199"
             txtZugriffscode.Text = "" '"0000"
+            txtZugriffscode.Text = VERAG_PROG_ALLGEMEIN.cMitarbeiter.getAccessCodeFrom_GRN(txtGRN.Text)
             ncts_ART = "VERAG_AT" : txtArtDetail.Text = "Bürgschaft VERAG Spedition AG (Österreich)" & vbNewLine & "05AT510000G000FP7"
-            cboArtSicherheit.changeItem("1") 'Gesamtbürgschaft
+            cboArtSicherheit.changeItem("0") 'Befreigung
             setBtn(btnBrgVERAG_AT, True)
         ElseIf sender Is btnBrgVERAG_DE Then
             txtGRN.Text = "17DE0000000071678"
@@ -118,6 +122,15 @@
             ncts_ART = "TOBB" : txtArtDetail.Text = "Sicherheit der Firma TOBB"
             cboArtSicherheit.changeItem("1") 'Gesamtbürgschaft
             setBtn(btnBrgTOBB, True)
+        ElseIf sender Is btnBRG_IMEX_AT Then
+            txtGRN.Text = "16AT520000G000VA6"
+            txtEORI_TIN.Text = "ATEOS1000059735"
+            txtZugriffscode.Text = ""
+            txtZugriffscode.Text = VERAG_PROG_ALLGEMEIN.cMitarbeiter.getAccessCodeFrom_GRN(txtGRN.Text)
+
+            ncts_ART = "IMEX_AT" : txtArtDetail.Text = "Bürgschaft IMEX Customs Service GmbH (Österreich)" & vbNewLine & "16AT520000G000VA6"
+            cboArtSicherheit.changeItem("1") 'Gesamtbürgschaft
+            setBtn(btnBRG_IMEX_AT, True)
         ElseIf sender Is btnBrgSGS Then
             txtGRN.Text = "16DE0000000068410"
             txtEORI_TIN.Text = "DE3331326"
@@ -200,6 +213,11 @@
         SA.nctsSA_ArtCode = cProgramFunctions.isLeerNothing(cboArtSicherheit._value)
         SA.nctsSA_GRN = cProgramFunctions.isLeerNothing(txtGRN._value)
         SA.nctsSA_Zugriffcode = cProgramFunctions.isLeerNothing(txtZugriffscode._value)
+
+        'Falls Zugriffscode leer --> von Mitarbeiterdaten  (AT BRG)
+        If If(SA.nctsSA_Zugriffcode, "") = "" Then
+            SA.nctsSA_Zugriffcode = VERAG_PROG_ALLGEMEIN.cMitarbeiter.getAccessCodeFrom_GRN(SA.nctsSA_GRN)
+        End If
         SA.nctsSA_TIN = cProgramFunctions.isLeerNothing(txtEORI_TIN._value)
         If SA.nctsSA_AbgabenBetrag Is Nothing Then SA.nctsSA_AbgabenBetrag = 0
         Return SA
@@ -218,6 +236,7 @@
         Select Case If(SA.nctsSA_GRN, "")
             Case "05AT510000G000FP7" : setBtn(btnBrgVERAG_AT, True)
             Case "17DE0000000071678" : setBtn(btnBrgVERAG_DE, True)
+            Case "16AT520000G000VA6" : setBtn(btnBRG_IMEX_AT, True)
             Case Else : setBtn(btnBrgSonstige, True)
         End Select
 

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 DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle37 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle38 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle39 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle40 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle41 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle42 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlKundenuebersicht))
-        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle43 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle44 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle45 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle46 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle48 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle47 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()
@@ -252,6 +252,7 @@ Partial Class usrCntlKundenuebersicht
         Me.btnReloadOP = New System.Windows.Forms.Button()
         Me.cboFirmaFMZOLL = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.SessionService1 = New VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.session.sessionService()
+        Me.lblAdressZusatz = New System.Windows.Forms.TextBox()
         Me.cntxtAddVM.SuspendLayout()
         Me.tbWeitereKundenDetails.SuspendLayout()
         Me.tbOfferten.SuspendLayout()
@@ -388,8 +389,8 @@ Partial Class usrCntlKundenuebersicht
         Me.dgvOfferteDetailsUebersicht.AllowUserToDeleteRows = False
         Me.dgvOfferteDetailsUebersicht.AllowUserToOrderColumns = True
         Me.dgvOfferteDetailsUebersicht.AllowUserToResizeRows = False
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle37.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.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle37
         Me.dgvOfferteDetailsUebersicht.BackgroundColor = System.Drawing.Color.White
         Me.dgvOfferteDetailsUebersicht.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
         Me.dgvOfferteDetailsUebersicht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
@@ -409,8 +410,8 @@ Partial Class usrCntlKundenuebersicht
         Me.dgvOffertenSperrliste.AllowUserToDeleteRows = False
         Me.dgvOffertenSperrliste.AllowUserToOrderColumns = True
         Me.dgvOffertenSperrliste.AllowUserToResizeRows = False
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle38.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.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle38
         Me.dgvOffertenSperrliste.BackgroundColor = System.Drawing.Color.White
         Me.dgvOffertenSperrliste.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
         Me.dgvOffertenSperrliste.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
@@ -420,10 +421,10 @@ Partial Class usrCntlKundenuebersicht
         Me.dgvOffertenSperrliste.Name = "dgvOffertenSperrliste"
         Me.dgvOffertenSperrliste.ReadOnly = True
         Me.dgvOffertenSperrliste.RowHeadersVisible = False
-        DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle39.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))
+        DataGridViewCellStyle39.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
+        DataGridViewCellStyle39.SelectionForeColor = System.Drawing.Color.Black
-        Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle3
+        Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle39
         Me.dgvOffertenSperrliste.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
         Me.dgvOffertenSperrliste.Size = New System.Drawing.Size(173, 257)
         Me.dgvOffertenSperrliste.TabIndex = 0
@@ -561,8 +562,8 @@ Partial Class usrCntlKundenuebersicht
         Me.dgvOffenePosten.AllowUserToAddRows = False
         Me.dgvOffenePosten.AllowUserToDeleteRows = False
         Me.dgvOffenePosten.AllowUserToResizeRows = False
-        DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle40.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.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle40
         Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White
         Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvOffenePosten.Dock = System.Windows.Forms.DockStyle.Fill
@@ -642,8 +643,8 @@ Partial Class usrCntlKundenuebersicht
         Me.dgvUmsatzbericht.AllowUserToDeleteRows = False
         Me.dgvUmsatzbericht.AllowUserToOrderColumns = True
         Me.dgvUmsatzbericht.AllowUserToResizeRows = False
-        DataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle41.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.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle41
         Me.dgvUmsatzbericht.BackgroundColor = System.Drawing.Color.White
         Me.dgvUmsatzbericht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvUmsatzbericht.Dock = System.Windows.Forms.DockStyle.Fill
@@ -705,8 +706,8 @@ Partial Class usrCntlKundenuebersicht
         Me.dgvAnhaenge.AllowUserToAddRows = False
         Me.dgvAnhaenge.AllowUserToDeleteRows = False
         Me.dgvAnhaenge.AllowUserToResizeRows = False
-        DataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle42.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.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle42
         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
@@ -1885,6 +1886,7 @@ Partial Class usrCntlKundenuebersicht
         Me.grpAdresse.Controls.Add(Me.lblStrasse)
         Me.grpAdresse.Controls.Add(Me.lblFirmenname2)
         Me.grpAdresse.Controls.Add(Me.lblTESTSystem)
+        Me.grpAdresse.Controls.Add(Me.lblAdressZusatz)
         Me.grpAdresse.Location = New System.Drawing.Point(3, 17)
         Me.grpAdresse.Name = "grpAdresse"
         Me.grpAdresse.Size = New System.Drawing.Size(499, 348)
@@ -2171,7 +2173,7 @@ Partial Class usrCntlKundenuebersicht
         Me.lblPostfach.BackColor = System.Drawing.Color.White
         Me.lblPostfach.BorderStyle = System.Windows.Forms.BorderStyle.None
         Me.lblPostfach.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblPostfach.Location = New System.Drawing.Point(6, 124)
+        Me.lblPostfach.Location = New System.Drawing.Point(6, 132)
         Me.lblPostfach.Name = "lblPostfach"
         Me.lblPostfach.ReadOnly = True
         Me.lblPostfach.Size = New System.Drawing.Size(491, 19)
@@ -2183,7 +2185,7 @@ Partial Class usrCntlKundenuebersicht
         Me.lblLandPlzOrt.BackColor = System.Drawing.Color.White
         Me.lblLandPlzOrt.BorderStyle = System.Windows.Forms.BorderStyle.None
         Me.lblLandPlzOrt.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblLandPlzOrt.Location = New System.Drawing.Point(6, 99)
+        Me.lblLandPlzOrt.Location = New System.Drawing.Point(6, 110)
         Me.lblLandPlzOrt.Name = "lblLandPlzOrt"
         Me.lblLandPlzOrt.ReadOnly = True
         Me.lblLandPlzOrt.Size = New System.Drawing.Size(491, 19)
@@ -2195,7 +2197,7 @@ Partial Class usrCntlKundenuebersicht
         Me.lblStrasse.BackColor = System.Drawing.Color.White
         Me.lblStrasse.BorderStyle = System.Windows.Forms.BorderStyle.None
         Me.lblStrasse.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblStrasse.Location = New System.Drawing.Point(6, 77)
+        Me.lblStrasse.Location = New System.Drawing.Point(6, 91)
         Me.lblStrasse.Name = "lblStrasse"
         Me.lblStrasse.ReadOnly = True
         Me.lblStrasse.Size = New System.Drawing.Size(491, 19)
@@ -2219,7 +2221,7 @@ Partial Class usrCntlKundenuebersicht
         Me.lblTESTSystem.AutoSize = True
         Me.lblTESTSystem.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblTESTSystem.ForeColor = System.Drawing.Color.Red
-        Me.lblTESTSystem.Location = New System.Drawing.Point(3, 59)
+        Me.lblTESTSystem.Location = New System.Drawing.Point(369, 3)
         Me.lblTESTSystem.Name = "lblTESTSystem"
         Me.lblTESTSystem.Size = New System.Drawing.Size(128, 17)
         Me.lblTESTSystem.TabIndex = 4
@@ -2380,8 +2382,8 @@ Partial Class usrCntlKundenuebersicht
         Me.dgvVollmachten.AllowUserToDeleteRows = False
         Me.dgvVollmachten.AllowUserToOrderColumns = True
         Me.dgvVollmachten.AllowUserToResizeRows = False
-        DataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle43.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.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle43
         Me.dgvVollmachten.BackgroundColor = System.Drawing.Color.White
         Me.dgvVollmachten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvVollmachten.Dock = System.Windows.Forms.DockStyle.Fill
@@ -2434,8 +2436,8 @@ Partial Class usrCntlKundenuebersicht
         Me.dgvVertraege.AllowUserToDeleteRows = False
         Me.dgvVertraege.AllowUserToOrderColumns = True
         Me.dgvVertraege.AllowUserToResizeRows = False
-        DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle44.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.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle44
         Me.dgvVertraege.BackgroundColor = System.Drawing.Color.White
         Me.dgvVertraege.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvVertraege.Dock = System.Windows.Forms.DockStyle.Fill
@@ -2598,8 +2600,8 @@ Partial Class usrCntlKundenuebersicht
         Me.dgvGestGarantie.AllowUserToDeleteRows = False
         Me.dgvGestGarantie.AllowUserToOrderColumns = True
         Me.dgvGestGarantie.AllowUserToResizeRows = False
-        DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle45.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.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle45
         Me.dgvGestGarantie.BackgroundColor = System.Drawing.Color.White
         Me.dgvGestGarantie.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvGestGarantie.Dock = System.Windows.Forms.DockStyle.Fill
@@ -3052,24 +3054,24 @@ Partial Class usrCntlKundenuebersicht
         Me.dgvAufschub.AllowUserToResizeColumns = False
         Me.dgvAufschub.AllowUserToResizeRows = False
         Me.dgvAufschub.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle46.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle46.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))
+        DataGridViewCellStyle46.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
+        DataGridViewCellStyle46.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle46.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle46.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle46.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvAufschub.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle10
+        Me.dgvAufschub.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle46
         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})
-        DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle48.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle48.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))
+        DataGridViewCellStyle48.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
+        DataGridViewCellStyle48.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle48.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle48.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        DataGridViewCellStyle48.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvAufschub.DefaultCellStyle = DataGridViewCellStyle12
+        Me.dgvAufschub.DefaultCellStyle = DataGridViewCellStyle48
         Me.dgvAufschub.Location = New System.Drawing.Point(13, 61)
         Me.dgvAufschub.MultiSelect = False
         Me.dgvAufschub.Name = "dgvAufschub"
@@ -3096,8 +3098,8 @@ Partial Class usrCntlKundenuebersicht
         '
         'HZA
         '
-        DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
+        DataGridViewCellStyle47.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
-        Me.HZA.DefaultCellStyle = DataGridViewCellStyle11
+        Me.HZA.DefaultCellStyle = DataGridViewCellStyle47
         Me.HZA.HeaderText = "HZA"
         Me.HZA.Name = "HZA"
         Me.HZA.ReadOnly = True
@@ -3281,6 +3283,18 @@ Partial Class usrCntlKundenuebersicht
         Me.SessionService1.Url = "https://finanzonline.bmf.gv.at/fonws/ws/session"
         Me.SessionService1.UseDefaultCredentials = False
         '
+        'lblAdressZusatz
+        '
+        Me.lblAdressZusatz.BackColor = System.Drawing.Color.White
+        Me.lblAdressZusatz.BorderStyle = System.Windows.Forms.BorderStyle.None
+        Me.lblAdressZusatz.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblAdressZusatz.Location = New System.Drawing.Point(6, 62)
+        Me.lblAdressZusatz.Name = "lblAdressZusatz"
+        Me.lblAdressZusatz.ReadOnly = True
+        Me.lblAdressZusatz.Size = New System.Drawing.Size(353, 19)
+        Me.lblAdressZusatz.TabIndex = 11
+        Me.lblAdressZusatz.Text = "Zusatz"
+        '
         'usrCntlKundenuebersicht
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -3587,4 +3601,5 @@ Partial Class usrCntlKundenuebersicht
     Friend WithEvents btnCreditsafe As Button
     Friend WithEvents FlatButton2 As VERAG_PROG_ALLGEMEIN.FlatButton
     Friend WithEvents SessionService1 As VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.session.sessionService
+    Friend WithEvents lblAdressZusatz As TextBox
 End Class

SDL/kunden/usrCntlKundenuebersicht.vb

@@ -391,6 +391,7 @@ Public Class usrCntlKundenuebersicht
 
             lblFirmenname1.Text = checkNullStr(ADRESSE.Name_1)
             lblFirmenname2.Text = checkNullStr(ADRESSE.Name_2)
+            lblAdressZusatz.Text = checkNullStr(KUNDE_ERW.kde_AdressZusatz)
 
             lblStrasse.Text = checkNullStr(ADRESSE.Straße)
             lblLandPlzOrt.Text = checkNullStr(ADRESSE.LandKz) & " - " & checkNullStr(ADRESSE.PLZ) & " - " & checkNullStr(ADRESSE.Ort)

SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb

@@ -22,22 +22,22 @@ Partial Class usrcntlKundeBearbeitenFull
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle31 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle32 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()
@@ -334,6 +334,8 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.cboAuswahl = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.txtAdresseZusatz = New System.Windows.Forms.TextBox()
+        Me.Label100 = New System.Windows.Forms.Label()
         Me.tbcntrDetails.SuspendLayout()
         Me.tbAbfertigung.SuspendLayout()
         Me.tbcntrAbf.SuspendLayout()
@@ -2586,8 +2588,8 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.dgvUmsatzbericht.AllowUserToDeleteRows = False
         Me.dgvUmsatzbericht.AllowUserToOrderColumns = True
         Me.dgvUmsatzbericht.AllowUserToResizeRows = False
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle17.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.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17
         Me.dgvUmsatzbericht.BackgroundColor = System.Drawing.Color.White
         Me.dgvUmsatzbericht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvUmsatzbericht.Location = New System.Drawing.Point(6, 25)
@@ -2686,8 +2688,8 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.dgvOffenePosten.AllowUserToDeleteRows = False
         Me.dgvOffenePosten.AllowUserToOrderColumns = True
         Me.dgvOffenePosten.AllowUserToResizeRows = False
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle18.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.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle18
         Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White
         Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvOffenePosten.Location = New System.Drawing.Point(6, 38)
@@ -2847,41 +2849,41 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.dgvKreditkarten.AllowUserToDeleteRows = False
         Me.dgvKreditkarten.AllowUserToOrderColumns = True
         Me.dgvKreditkarten.AllowUserToResizeRows = False
-        DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle19.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.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle19
         Me.dgvKreditkarten.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle20.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))
+        DataGridViewCellStyle20.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
+        DataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4
+        Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle20
         Me.dgvKreditkarten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle21.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))
+        DataGridViewCellStyle21.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
+        DataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle5
+        Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle21
         Me.dgvKreditkarten.Location = New System.Drawing.Point(9, 20)
         Me.dgvKreditkarten.MultiSelect = False
         Me.dgvKreditkarten.Name = "dgvKreditkarten"
         Me.dgvKreditkarten.ReadOnly = True
-        DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle22.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))
+        DataGridViewCellStyle22.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
+        DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle6
+        Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle22
         Me.dgvKreditkarten.RowHeadersVisible = False
-        DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle23.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.RowsDefaultCellStyle = DataGridViewCellStyle23
         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)
@@ -3021,26 +3023,26 @@ Partial Class usrcntlKundeBearbeitenFull
         '
         'dgvUstv_LaenderUndSteuernummern
         '
-        DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle24.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.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle24
         Me.dgvUstv_LaenderUndSteuernummern.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle25.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))
+        DataGridViewCellStyle25.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
+        DataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle9
+        Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle25
         Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle26.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))
+        DataGridViewCellStyle26.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
+        DataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        DataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvUstv_LaenderUndSteuernummern.DefaultCellStyle = DataGridViewCellStyle10
+        Me.dgvUstv_LaenderUndSteuernummern.DefaultCellStyle = DataGridViewCellStyle26
         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)
@@ -3278,26 +3280,26 @@ Partial Class usrcntlKundeBearbeitenFull
         'dgvSonst_IDSKunden
         '
         Me.dgvSonst_IDSKunden.AllowUserToResizeRows = False
-        DataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle27.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.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle27
         Me.dgvSonst_IDSKunden.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle28.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))
+        DataGridViewCellStyle28.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
+        DataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvSonst_IDSKunden.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle12
+        Me.dgvSonst_IDSKunden.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle28
         Me.dgvSonst_IDSKunden.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle29.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))
+        DataGridViewCellStyle29.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
+        DataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        DataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvSonst_IDSKunden.DefaultCellStyle = DataGridViewCellStyle13
+        Me.dgvSonst_IDSKunden.DefaultCellStyle = DataGridViewCellStyle29
         Me.dgvSonst_IDSKunden.Location = New System.Drawing.Point(9, 251)
         Me.dgvSonst_IDSKunden.MultiSelect = False
         Me.dgvSonst_IDSKunden.Name = "dgvSonst_IDSKunden"
@@ -3515,26 +3517,26 @@ Partial Class usrcntlKundeBearbeitenFull
         'DataGridView1
         '
         Me.DataGridView1.AllowUserToResizeRows = False
-        DataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle30.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.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle30
         Me.DataGridView1.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle31.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))
+        DataGridViewCellStyle31.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
+        DataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.DataGridView1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle15
+        Me.DataGridView1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle31
         Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle32.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))
+        DataGridViewCellStyle32.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
+        DataGridViewCellStyle32.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle32.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle32.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        DataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.DataGridView1.DefaultCellStyle = DataGridViewCellStyle16
+        Me.DataGridView1.DefaultCellStyle = DataGridViewCellStyle32
         Me.DataGridView1.Enabled = False
         Me.DataGridView1.Location = New System.Drawing.Point(9, 93)
         Me.DataGridView1.MultiSelect = False
@@ -3556,7 +3558,7 @@ Partial Class usrcntlKundeBearbeitenFull
         '
         Me.Label84.AutoSize = True
         Me.Label84.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label84.Location = New System.Drawing.Point(259, 108)
+        Me.Label84.Location = New System.Drawing.Point(259, 112)
         Me.Label84.Name = "Label84"
         Me.Label84.Size = New System.Drawing.Size(66, 13)
         Me.Label84.TabIndex = 8
@@ -3564,6 +3566,8 @@ Partial Class usrcntlKundeBearbeitenFull
         '
         'GroupBox3
         '
+        Me.GroupBox3.Controls.Add(Me.Label100)
+        Me.GroupBox3.Controls.Add(Me.txtAdresseZusatz)
         Me.GroupBox3.Controls.Add(Me.cbxUIDMehrfachverwendung)
         Me.GroupBox3.Controls.Add(Me.btnCreditsafe)
         Me.GroupBox3.Controls.Add(Me.Button13)
@@ -3595,7 +3599,7 @@ Partial Class usrcntlKundeBearbeitenFull
         '
         Me.cbxUIDMehrfachverwendung.AutoSize = True
         Me.cbxUIDMehrfachverwendung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cbxUIDMehrfachverwendung.Location = New System.Drawing.Point(10, 131)
+        Me.cbxUIDMehrfachverwendung.Location = New System.Drawing.Point(10, 133)
         Me.cbxUIDMehrfachverwendung.Name = "cbxUIDMehrfachverwendung"
         Me.cbxUIDMehrfachverwendung.Size = New System.Drawing.Size(152, 17)
         Me.cbxUIDMehrfachverwendung.TabIndex = 25
@@ -3607,9 +3611,9 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.btnCreditsafe.BackgroundImage = Global.SDL.My.Resources.Resources.creditsafe_add1
         Me.btnCreditsafe.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.btnCreditsafe.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnCreditsafe.Location = New System.Drawing.Point(9, 62)
+        Me.btnCreditsafe.Location = New System.Drawing.Point(9, 57)
         Me.btnCreditsafe.Name = "btnCreditsafe"
-        Me.btnCreditsafe.Size = New System.Drawing.Size(95, 31)
+        Me.btnCreditsafe.Size = New System.Drawing.Size(88, 27)
         Me.btnCreditsafe.TabIndex = 25
         Me.btnCreditsafe.UseVisualStyleBackColor = True
         Me.btnCreditsafe.Visible = False
@@ -3620,7 +3624,7 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.Button13.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.Button13.FlatAppearance.BorderSize = 0
         Me.Button13.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button13.Location = New System.Drawing.Point(419, 105)
+        Me.Button13.Location = New System.Drawing.Point(419, 109)
         Me.Button13.Name = "Button13"
         Me.Button13.Size = New System.Drawing.Size(25, 20)
         Me.Button13.TabIndex = 16
@@ -3632,7 +3636,7 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.btnUIDPruef.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.btnUIDPruef.FlatAppearance.BorderSize = 0
         Me.btnUIDPruef.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnUIDPruef.Location = New System.Drawing.Point(397, 105)
+        Me.btnUIDPruef.Location = New System.Drawing.Point(397, 109)
         Me.btnUIDPruef.Name = "btnUIDPruef"
         Me.btnUIDPruef.Size = New System.Drawing.Size(25, 20)
         Me.btnUIDPruef.TabIndex = 15
@@ -3700,7 +3704,7 @@ Partial Class usrcntlKundeBearbeitenFull
         'txtFirmenname1
         '
         Me.txtFirmenname1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtFirmenname1.Location = New System.Drawing.Point(110, 42)
+        Me.txtFirmenname1.Location = New System.Drawing.Point(110, 40)
         Me.txtFirmenname1.MaxLength = 40
         Me.txtFirmenname1.Name = "txtFirmenname1"
         Me.txtFirmenname1.Size = New System.Drawing.Size(334, 20)
@@ -3716,7 +3720,7 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.cboUSt_UstIdNrLand.FlatStyle = System.Windows.Forms.FlatStyle.System
         Me.cboUSt_UstIdNrLand.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.cboUSt_UstIdNrLand.FormattingEnabled = True
-        Me.cboUSt_UstIdNrLand.Location = New System.Drawing.Point(111, 105)
+        Me.cboUSt_UstIdNrLand.Location = New System.Drawing.Point(111, 109)
         Me.cboUSt_UstIdNrLand.Name = "cboUSt_UstIdNrLand"
         Me.cboUSt_UstIdNrLand.Size = New System.Drawing.Size(43, 21)
         Me.cboUSt_UstIdNrLand.TabIndex = 6
@@ -3725,7 +3729,7 @@ Partial Class usrcntlKundeBearbeitenFull
         '
         Me.Label15.AutoSize = True
         Me.Label15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label15.Location = New System.Drawing.Point(8, 108)
+        Me.Label15.Location = New System.Drawing.Point(8, 112)
         Me.Label15.Name = "Label15"
         Me.Label15.Size = New System.Drawing.Size(39, 13)
         Me.Label15.TabIndex = 5
@@ -3735,7 +3739,7 @@ Partial Class usrcntlKundeBearbeitenFull
         '
         Me.Label3.AutoSize = True
         Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label3.Location = New System.Drawing.Point(6, 45)
+        Me.Label3.Location = New System.Drawing.Point(6, 43)
         Me.Label3.Name = "Label3"
         Me.Label3.Size = New System.Drawing.Size(67, 13)
         Me.Label3.TabIndex = 2
@@ -3756,7 +3760,7 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.txtUSt_UstIdNrGeprueftAm._Waehrung = False
         Me.txtUSt_UstIdNrGeprueftAm._WaehrungZeichen = True
         Me.txtUSt_UstIdNrGeprueftAm.ForeColor = System.Drawing.Color.Red
-        Me.txtUSt_UstIdNrGeprueftAm.Location = New System.Drawing.Point(324, 105)
+        Me.txtUSt_UstIdNrGeprueftAm.Location = New System.Drawing.Point(324, 109)
         Me.txtUSt_UstIdNrGeprueftAm.MaxLength = 10
         Me.txtUSt_UstIdNrGeprueftAm.MaxLineLength = -1
         Me.txtUSt_UstIdNrGeprueftAm.MaxLines_Warning = ""
@@ -3790,7 +3794,7 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.txtUSt_UstIdNr._Waehrung = False
         Me.txtUSt_UstIdNr._WaehrungZeichen = True
         Me.txtUSt_UstIdNr.ForeColor = System.Drawing.Color.Black
-        Me.txtUSt_UstIdNr.Location = New System.Drawing.Point(154, 105)
+        Me.txtUSt_UstIdNr.Location = New System.Drawing.Point(154, 109)
         Me.txtUSt_UstIdNr.MaxLength = 12
         Me.txtUSt_UstIdNr.MaxLineLength = -1
         Me.txtUSt_UstIdNr.MaxLines_Warning = ""
@@ -3803,7 +3807,7 @@ Partial Class usrcntlKundeBearbeitenFull
         'txtFirmenname2
         '
         Me.txtFirmenname2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtFirmenname2.Location = New System.Drawing.Point(110, 68)
+        Me.txtFirmenname2.Location = New System.Drawing.Point(110, 59)
         Me.txtFirmenname2.MaxLength = 40
         Me.txtFirmenname2.Name = "txtFirmenname2"
         Me.txtFirmenname2.Size = New System.Drawing.Size(334, 20)
@@ -3813,7 +3817,7 @@ Partial Class usrcntlKundeBearbeitenFull
         '
         Me.Label16.AutoSize = True
         Me.Label16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label16.Location = New System.Drawing.Point(240, 135)
+        Me.Label16.Location = New System.Drawing.Point(240, 137)
         Me.Label16.Name = "Label16"
         Me.Label16.Size = New System.Drawing.Size(78, 13)
         Me.Label16.TabIndex = 10
@@ -3834,7 +3838,7 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.txtUSt_Steuernummer._Waehrung = False
         Me.txtUSt_Steuernummer._WaehrungZeichen = True
         Me.txtUSt_Steuernummer.ForeColor = System.Drawing.Color.Black
-        Me.txtUSt_Steuernummer.Location = New System.Drawing.Point(324, 132)
+        Me.txtUSt_Steuernummer.Location = New System.Drawing.Point(324, 134)
         Me.txtUSt_Steuernummer.MaxLineLength = -1
         Me.txtUSt_Steuernummer.MaxLines_Warning = ""
         Me.txtUSt_Steuernummer.MaxLines_Warning_Label = Nothing
@@ -4482,6 +4486,25 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.DataGridViewTextBoxColumn2.HeaderText = "E-Mail"
         Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2"
         '
+        'txtAdresseZusatz
+        '
+        Me.txtAdresseZusatz.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtAdresseZusatz.Location = New System.Drawing.Point(110, 84)
+        Me.txtAdresseZusatz.MaxLength = 50
+        Me.txtAdresseZusatz.Name = "txtAdresseZusatz"
+        Me.txtAdresseZusatz.Size = New System.Drawing.Size(334, 20)
+        Me.txtAdresseZusatz.TabIndex = 26
+        '
+        'Label100
+        '
+        Me.Label100.AutoSize = True
+        Me.Label100.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label100.Location = New System.Drawing.Point(8, 88)
+        Me.Label100.Name = "Label100"
+        Me.Label100.Size = New System.Drawing.Size(77, 13)
+        Me.Label100.TabIndex = 27
+        Me.Label100.Text = "Adress-Zusatz:"
+        '
         'usrcntlKundeBearbeitenFull
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -4866,4 +4889,6 @@ Partial Class usrcntlKundeBearbeitenFull
     Friend WithEvents txtCreditsafe As TextBox
     Friend WithEvents cbxSndDatenAusSTB As CheckBox
     Friend WithEvents cbxUIDMehrfachverwendung As CheckBox
+    Friend WithEvents Label100 As Label
+    Friend WithEvents txtAdresseZusatz As TextBox
 End Class

SDL/kunden/usrcntlKundeBearbeitenFull.vb

@@ -151,6 +151,7 @@ Public Class usrcntlKundeBearbeitenFull
 
         txtFirmenname1.Text = loadValue(ADRESSE.Name_1, "")
         txtFirmenname2.Text = loadValue(ADRESSE.Name_2, "")
+        txtAdresseZusatz.Text = loadValue(KUNDE_ERW.kde_AdressZusatz, "")
 
         txtStrasse.Text = loadValue(ADRESSE.Straße, "")
         txtPlz.Text = loadValue(ADRESSE.PLZ, "")
@@ -454,6 +455,8 @@ Public Class usrcntlKundeBearbeitenFull
 
         ADRESSE.Name_1 = isLeerNothing(txtFirmenname1.Text)
         ADRESSE.Name_2 = isLeerNothing(txtFirmenname2.Text)
+        ADRESSE.Name_2 = isLeerNothing(txtFirmenname2.Text)
+        KUNDE_ERW.kde_AdressZusatz = (txtAdresseZusatz.Text)
 
         ADRESSE.Straße = isLeerNothing(txtStrasse.Text)
         ADRESSE.PLZ = isLeerNothing(txtPlz.Text)

SDL/mdm/frmMDMDatenverarbetiung.Designer.vb

@@ -35,6 +35,7 @@ Partial Class frmMDMDatenverarbetiung
         Me.dat_Sum_Bis = New System.Windows.Forms.DateTimePicker()
         Me.lbl = New System.Windows.Forms.Label()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.lblProzPruef = New System.Windows.Forms.Label()
         Me.PictureBox1 = New System.Windows.Forms.PictureBox()
         Me.pic = New System.Windows.Forms.PictureBox()
         Me.Panel3 = New System.Windows.Forms.Panel()
@@ -60,7 +61,8 @@ Partial Class frmMDMDatenverarbetiung
         Me.Button3 = New System.Windows.Forms.Button()
         Me.Button2 = New System.Windows.Forms.Button()
         Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
-        Me.lblProzPruef = New System.Windows.Forms.Label()
+        Me.Button7 = New System.Windows.Forms.Button()
+        Me.Panel4 = New System.Windows.Forms.Panel()
         Me.pnl.SuspendLayout()
         Me.FlowLayoutPanel.SuspendLayout()
         Me.Panel1.SuspendLayout()
@@ -69,17 +71,15 @@ Partial Class frmMDMDatenverarbetiung
         Me.Panel3.SuspendLayout()
         Me.Panel2.SuspendLayout()
         CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.Panel4.SuspendLayout()
         Me.SuspendLayout()
         '
         'pnl
         '
+        Me.pnl.Controls.Add(Me.Panel4)
         Me.pnl.Controls.Add(Me.FlowLayoutPanel)
         Me.pnl.Controls.Add(Me.btnDatenLaden)
         Me.pnl.Controls.Add(Me.Label1)
-        Me.pnl.Controls.Add(Me.dat_Sum_Von)
-        Me.pnl.Controls.Add(Me.Label45)
-        Me.pnl.Controls.Add(Me.Label46)
-        Me.pnl.Controls.Add(Me.dat_Sum_Bis)
         Me.pnl.Controls.Add(Me.lbl)
         Me.pnl.Cursor = System.Windows.Forms.Cursors.Default
         Me.pnl.Dock = System.Windows.Forms.DockStyle.Top
@@ -95,6 +95,7 @@ Partial Class frmMDMDatenverarbetiung
         Me.FlowLayoutPanel.BackColor = System.Drawing.Color.FloralWhite
         Me.FlowLayoutPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.FlowLayoutPanel.Controls.Add(Me.btn)
+        Me.FlowLayoutPanel.Controls.Add(Me.Button7)
         Me.FlowLayoutPanel.Location = New System.Drawing.Point(139, 37)
         Me.FlowLayoutPanel.Name = "FlowLayoutPanel"
         Me.FlowLayoutPanel.Size = New System.Drawing.Size(840, 31)
@@ -134,7 +135,7 @@ Partial Class frmMDMDatenverarbetiung
         'dat_Sum_Von
         '
         Me.dat_Sum_Von.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
-        Me.dat_Sum_Von.Location = New System.Drawing.Point(139, 74)
+        Me.dat_Sum_Von.Location = New System.Drawing.Point(143, 6)
         Me.dat_Sum_Von.Name = "dat_Sum_Von"
         Me.dat_Sum_Von.Size = New System.Drawing.Size(103, 20)
         Me.dat_Sum_Von.TabIndex = 22
@@ -142,7 +143,7 @@ Partial Class frmMDMDatenverarbetiung
         'Label45
         '
         Me.Label45.AutoSize = True
-        Me.Label45.Location = New System.Drawing.Point(245, 77)
+        Me.Label45.Location = New System.Drawing.Point(249, 9)
         Me.Label45.Name = "Label45"
         Me.Label45.Size = New System.Drawing.Size(23, 13)
         Me.Label45.TabIndex = 25
@@ -151,7 +152,7 @@ Partial Class frmMDMDatenverarbetiung
         'Label46
         '
         Me.Label46.AutoSize = True
-        Me.Label46.Location = New System.Drawing.Point(13, 77)
+        Me.Label46.Location = New System.Drawing.Point(13, 9)
         Me.Label46.Name = "Label46"
         Me.Label46.Size = New System.Drawing.Size(119, 13)
         Me.Label46.TabIndex = 23
@@ -160,7 +161,7 @@ Partial Class frmMDMDatenverarbetiung
         'dat_Sum_Bis
         '
         Me.dat_Sum_Bis.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
-        Me.dat_Sum_Bis.Location = New System.Drawing.Point(274, 74)
+        Me.dat_Sum_Bis.Location = New System.Drawing.Point(278, 6)
         Me.dat_Sum_Bis.Name = "dat_Sum_Bis"
         Me.dat_Sum_Bis.Size = New System.Drawing.Size(103, 20)
         Me.dat_Sum_Bis.TabIndex = 24
@@ -171,7 +172,7 @@ Partial Class frmMDMDatenverarbetiung
         Me.lbl.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold)
         Me.lbl.Location = New System.Drawing.Point(13, 13)
         Me.lbl.Name = "lbl"
-        Me.lbl.Size = New System.Drawing.Size(246, 25)
+        Me.lbl.Size = New System.Drawing.Size(183, 17)
         Me.lbl.TabIndex = 0
         Me.lbl.Text = "MDM Datenverarbeitung"
         '
@@ -200,6 +201,15 @@ Partial Class frmMDMDatenverarbetiung
         Me.Panel1.Size = New System.Drawing.Size(1163, 114)
         Me.Panel1.TabIndex = 2
         '
+        'lblProzPruef
+        '
+        Me.lblProzPruef.Location = New System.Drawing.Point(63, 92)
+        Me.lblProzPruef.Name = "lblProzPruef"
+        Me.lblProzPruef.Size = New System.Drawing.Size(69, 13)
+        Me.lblProzPruef.TabIndex = 41
+        Me.lblProzPruef.Text = "0%"
+        Me.lblProzPruef.TextAlign = System.Drawing.ContentAlignment.TopRight
+        '
         'PictureBox1
         '
         Me.PictureBox1.BackgroundImage = Global.SDL.My.Resources.Resources.ok
@@ -316,7 +326,7 @@ Partial Class frmMDMDatenverarbetiung
         Me.cbx.AutoSize = True
         Me.cbx.Location = New System.Drawing.Point(13, 73)
         Me.cbx.Name = "cbx"
-        Me.cbx.Size = New System.Drawing.Size(110, 21)
+        Me.cbx.Size = New System.Drawing.Size(103, 17)
         Me.cbx.TabIndex = 42
         Me.cbx.Text = "Prüfergebnis OK"
         Me.cbx.UseVisualStyleBackColor = True
@@ -504,14 +514,27 @@ Partial Class frmMDMDatenverarbetiung
         Me.MyDatagridview1.Size = New System.Drawing.Size(1163, 577)
         Me.MyDatagridview1.TabIndex = 0
         '
-        'lblProzPruef
+        'Button7
         '
-        Me.lblProzPruef.Location = New System.Drawing.Point(63, 92)
+        Me.Button7.BackColor = System.Drawing.Color.FloralWhite
-        Me.lblProzPruef.Name = "lblProzPruef"
+        Me.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.lblProzPruef.Size = New System.Drawing.Size(69, 13)
+        Me.Button7.Location = New System.Drawing.Point(129, 3)
-        Me.lblProzPruef.TabIndex = 41
+        Me.Button7.Name = "Button7"
-        Me.lblProzPruef.Text = "0%"
+        Me.Button7.Size = New System.Drawing.Size(120, 23)
-        Me.lblProzPruef.TextAlign = System.Drawing.ContentAlignment.TopRight
+        Me.Button7.TabIndex = 1
+        Me.Button7.Text = "UTA"
+        Me.Button7.UseVisualStyleBackColor = False
+        '
+        'Panel4
+        '
+        Me.Panel4.Controls.Add(Me.Label46)
+        Me.Panel4.Controls.Add(Me.dat_Sum_Bis)
+        Me.Panel4.Controls.Add(Me.Label45)
+        Me.Panel4.Controls.Add(Me.dat_Sum_Von)
+        Me.Panel4.Location = New System.Drawing.Point(0, 67)
+        Me.Panel4.Name = "Panel4"
+        Me.Panel4.Size = New System.Drawing.Size(583, 33)
+        Me.Panel4.TabIndex = 28
         '
         'frmMDMDatenverarbetiung
         '
@@ -537,6 +560,8 @@ Partial Class frmMDMDatenverarbetiung
         Me.Panel2.ResumeLayout(False)
         Me.Panel2.PerformLayout()
         CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.Panel4.ResumeLayout(False)
+        Me.Panel4.PerformLayout()
         Me.ResumeLayout(False)
 
     End Sub
@@ -578,4 +603,6 @@ Partial Class frmMDMDatenverarbetiung
     Friend WithEvents pic As PictureBox
     Friend WithEvents Button6 As Button
     Friend WithEvents lblProzPruef As Label
+    Friend WithEvents Button7 As Button
+    Friend WithEvents Panel4 As Panel
 End Class

SDL/mdm/frmMDMDatenverarbetiung.vb

@@ -1,5 +1,7 @@
 Imports System.Data.OleDb
 Imports System.IO
+Imports com.sun.jdi
+Imports DAKOSY_Worker.NichtAbschliessendeFestsetzung
 
 Public Class frmMDMDatenverarbetiung
 
@@ -25,6 +27,7 @@ Public Class frmMDMDatenverarbetiung
     Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
         Select Case LIEFERANT
             Case "PLOSE" : genSummenbericht_PLOSE()
+            Case Else : MsgBox("Nicht verfügbar!")
         End Select
     End Sub
 
@@ -38,6 +41,7 @@ Public Class frmMDMDatenverarbetiung
         Dim pruef As Boolean = False
         Select Case LIEFERANT
             Case "PLOSE" : pruef = pruefData_PLOSE()
+            Case Else : MsgBox("Nicht verfügbar!") : Exit Sub
         End Select
 
         cbx.Checked = pruef
@@ -62,6 +66,7 @@ Public Class frmMDMDatenverarbetiung
 
         Select Case LIEFERANT
             Case "PLOSE" : initDgv_PLOSE()
+            Case "UTA" : initDgv_UTA()
         End Select
     End Sub
 
@@ -74,6 +79,12 @@ Public Class frmMDMDatenverarbetiung
                         setFakturiertPLOSE()
                     End If
                 End If
+            Case "UTA"
+                If genRGAtt_UTA() Then
+                    'If MautD_Befuellen() Then
+                    '    setFakturiertUTA()
+                    'End If
+                End If
         End Select
     End Sub
 
@@ -258,6 +269,89 @@ Public Class frmMDMDatenverarbetiung
         End With
 
     End Sub
+    Sub initDgv_UTA()
+        With MyDatagridview1
+            .Columns.Clear()
+            Exit Sub
+            'MsgBox(.sql)
+
+            .SET_SQL("  SELECT Adressen.AdressenNr, Adressen.[Name 1], Adressen.LandKz, Adressen.Ort,Offertenpositionen.OffertenNr, Offertenpositionen.LeistungsNr, Offertenpositionen.LeistungsBez, tblUTAFakturierwarenarten.Warenart, tblUTAImport.Fakturierwarenart
+                        FROM tblUTAFakturierwarenarten 
+                        INNER JOIN (((Adressen INNER JOIN tblUTAImport ON Adressen.UTAKundenNr = tblUTAImport.Kundennummer) 
+                        INNER JOIN Offertenpositionen ON Adressen.AdressenNr = Offertenpositionen.KundenNr) 
+                        INNER JOIN tblUTALeistungen ON (tblUTALeistungen.VERAG_LeistungsNr = Offertenpositionen.LeistungsNr) AND (tblUTALeistungen.VERAG_OffertenNr = Offertenpositionen.OffertenNr) AND (tblUTAImport.Lieferland = tblUTALeistungen.Lieferland) AND (tblUTAImport.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart
+                        group by Adressen.AdressenNr, Adressen.[Name 1], Adressen.LandKz, Adressen.Ort, Offertenpositionen.OffertenNr, Offertenpositionen.LeistungsNr, Offertenpositionen.LeistungsBez, tblUTAFakturierwarenarten.Warenart,tblUTAImport.Fakturierwarenart", "FMZOLL")
+            .LOAD()
+            'MsgBox(.GET_SQL())
+            If .Columns.Count > 0 Then
+
+                '.Columns("plose_POLSEKundennummer").HeaderText = "PLOSE KdNr"
+                '.Columns("plose_ProduktCode").HeaderText = "ProduktCode"
+                '.Columns("plose_Produktbeschreibung").HeaderText = "Beschreibung"
+                '.Columns("plose_Produktbeschreibung").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+                '.Columns("plose_Menge").HeaderText = "Menge"
+                '.Columns("plose_Preis").HeaderText = "Preis"
+                '.Columns("plose_NettobetragWaehrungAbbuchung").HeaderText = "Netto"
+                '.Columns("plose_MWSTBetragWaehrungAbbuchung").HeaderText = "MWST"
+                '.Columns("plose_BruttobetragWaehrungAbbuchung").HeaderText = "Brutto"
+
+                '.Columns("VERAGLeistungsNr").ReadOnly = False
+                '.Columns("VERAGKdNr").ReadOnly = False
+
+                'For Each r As DataGridViewColumn In .Columns
+                '    If r.Name = "VERAGLeistungsNr" Or r.Name = "VERAGKdNr" Then
+                '        r.ReadOnly = False
+                '    Else
+                '        r.ReadOnly = True
+                '    End If
+                'Next
+
+
+                'Dim c As New DataGridViewTextBoxColumn
+                'c.Name = "VERAGKdNr"
+                'c.HeaderText = "VERAG KdNr"
+                'c.Width = 100
+                '.Columns.Insert(1, c)
+
+                'c = New DataGridViewTextBoxColumn
+                'c.Name = "VERAGLeistungsNr"
+                'c.HeaderText = "VERAG/PLOSE LeistungsNr."
+                'c.Width = 100
+                '.Columns.Insert(2, c)
+
+                'c = New DataGridViewTextBoxColumn
+                'c.Name = "KundeOffertenNr"
+                'c.HeaderText = "Kunde OffertenNr."
+                'c.Width = 100
+                '.Columns.Insert(3, c)
+
+                'c = New DataGridViewTextBoxColumn
+                'c.Name = "KundeLeistungsNr"
+                'c.HeaderText = "Kunde LeistungsNr."
+                'c.Width = 100
+                '.Columns.Insert(4, c)
+
+
+
+                .AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells
+
+            End If
+
+            'Dim sumBto As Double = 0
+            'Dim sumNto As Double = 0
+            'For Each r As DataGridViewRow In .Rows
+            '    sumBto += If(IsNumeric(r.Cells("plose_BruttobetragWaehrungAbbuchung").Value), CDbl(r.Cells("plose_BruttobetragWaehrungAbbuchung").Value), 0)
+            '    sumNto += If(IsNumeric(r.Cells("plose_NettobetragWaehrungAbbuchung").Value), CDbl(r.Cells("plose_NettobetragWaehrungAbbuchung").Value), 0)
+            'Next
+
+            'txtAnzahl.Text = .Rows.Count
+            'txtPruefsummeNetto.Text = CDbl(sumNto).ToString("C2")
+            'txtPruefsummeBrutto.Text = CDbl(sumBto).ToString("C2")
+            .ClearSelection()
+
+        End With
+
+    End Sub
 
 
     Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click
@@ -279,9 +373,15 @@ Public Class frmMDMDatenverarbetiung
 
         Select Case Me.LIEFERANT
             Case "PLOSE"
+                Panel4.Visible = True
                 Dim c As New usrCntlMDMDatenverarbeitungAuswertungen_PLOSE(Me)
                 Panel3.Controls.Add(c)
                 c.Dock = DockStyle.Fill
+            Case "UTA"
+                Panel4.Visible = False
+                'Dim c As New usrCntlMDMDatenverarbeitungAuswertungen_UTA(Me)
+                'Panel3.Controls.Add(c)
+                'c.Dock = DockStyle.Fill
         End Select
 
         init()
@@ -353,6 +453,90 @@ Public Class frmMDMDatenverarbetiung
         Return False
     End Function
 
+    Function genRGAtt_UTA() As Boolean
+        Dim top = ""
+        'top = " TOP 20 "
+        Dim SQLStr = " 	SELECT " & top & " Kundennummer AS [Customer ID], KundenNr AS [Customer Nr], UTAExportCSV,Rechnungsdruck
+                        FROM tblUTAFakturierwarenarten 
+                        INNER JOIN (((Adressen INNER JOIN tblUTAImport ON Adressen.UTAKundenNr = tblUTAImport.Kundennummer) 
+                        INNER JOIN Offertenpositionen ON Adressen.AdressenNr = Offertenpositionen.KundenNr)
+                        INNER JOIN tblUTALeistungen ON (tblUTALeistungen.VERAG_LeistungsNr = Offertenpositionen.LeistungsNr) AND (tblUTALeistungen.VERAG_OffertenNr = Offertenpositionen.OffertenNr) AND (tblUTAImport.Lieferland = tblUTALeistungen.Lieferland) AND (tblUTAImport.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart
+                        group by Kundennummer, KundenNr, UTAExportCSV,Rechnungsdruck
+                        "
+        'Dim SQLStr = " 	SELECT TOP 3 [Customer ID],[Customer Nr], UTAExportCSV,Rechnungsdruck  , sum(  Gesamtbetrag_Brutto_in_Darstellwährung  )
+        ' FROM(
+        '              	    SELECT  Kundennummer AS [Customer ID], KundenNr AS [Customer Nr], UTAExportCSV,Rechnungsdruck  ,  (  Gesamtbetrag_Brutto_in_Darstellwährung  )
+        '                    FROM tblUTAImport 
+        '                    INNER JOIN  Adressen ON Adressen.UTAKundenNr = tblUTAImport.Kundennummer
+        '     INNER JOIN Offertenpositionen ON Adressen.AdressenNr = Offertenpositionen.KundenNr  
+        '  INNER JOIN tblUTALeistungen ON (tblUTALeistungen.VERAG_LeistungsNr = Offertenpositionen.LeistungsNr) AND (tblUTALeistungen.VERAG_OffertenNr = Offertenpositionen.OffertenNr) AND (tblUTAImport.Lieferland = tblUTALeistungen.Lieferland) AND (tblUTAImport.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)
+        '  INNER JOIN tblUTAFakturierwarenarten ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart
+        '              	    ) as T1   /*WHERE Gesamtbetrag_Brutto_in_Darstellwährung <>0*/
+        '                 group by [Customer ID],[Customer Nr], UTAExportCSV,Rechnungsdruck
+        '                "
+        Dim dt_Main As DataTable = SQL.loadDgvBySql_Param(SQLStr, "FMZOLL", 1200)
+        'MsgBox("Keine Daten!""SELECT [AdressenNr],PLOSEKundenNr FROM tblPLOSE_Details INNER JOIN Adressen ON plose_POLSEKundennummer=PLOSEKundenNr  where AND plose_Fakturiert = 0 AND  plose_DatumTransaktion between '" & dat_Sum_Von.Value.ToShortDateString & "' and '" & dat_Sum_Bis.Value.ToShortDateString & "'  group by [AdressenNr],PLOSEKundenNr ")
+        If dt_Main Is Nothing OrElse dt_Main.Rows.Count = 0 Then
+            MsgBox("Keine Daten!")
+            Return False
+        End If
+        Dim cnt = 0
+        If vbYes = MsgBox("Es wurden Daten von " & dt_Main.Rows.Count & " Kunden gefunden " & vbNewLine & " Möchten Sie die Anhänge erstellen?", vbYesNoCancel) Then
+            Dim dir = "F:\FMZoll\Maut\UTA\Archiv\" & Now.ToShortDateString
+
+            If Directory.Exists(dir) Then dir &= "_" & Now.ToShortTimeString.Replace(":", "")
+            Directory.CreateDirectory(dir)
+            For Each R_PLOSE In dt_Main.Rows
+
+                Dim SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch = Nothing
+                Dim verarbOK = True
+                '   If Not genUTA_SPEDBUCH_ByKdNr(R_PLOSE("AdressenNr"), R_PLOSE("PLOSEKundenNr"), dat_Sum_Von.Value.ToShortDateString, dat_Sum_Bis.Value.ToShortDateString, SPEDBUCH) Then verarbOK = False
+                '  If Not genUTA_RECHNUNG_BySPEDBUCH(R_PLOSE("AdressenNr"), R_PLOSE("PLOSEKundenNr"), SPEDBUCH, dat_Sum_Von.Value, dat_Sum_Bis.Value) Then verarbOK = False
+                genUTAAttachmentByKdNr(R_PLOSE("Customer Nr"), R_PLOSE("Customer ID"), dir, datPloseAnhang.Value) 'R_PLOSE("AdressenNr"), R_PLOSE("PLOSEKundenNr"), dat_Sum_Von.Value.ToShortDateString, dat_Sum_Bis.Value.ToShortDateString, dir)
+
+                If verarbOK Then
+                    'UPDATE Fakturiert
+                    '   SQL.doSQL("UPDATE tblPLOSE_Details SET plose_FakturiertDatum=GETDATE() WHERE plose_Fakturiert = 0  AND plose_DatumTransaktion between '" & dat_Sum_Von.Value.ToShortDateString & "' and '" & dat_Sum_Bis.Value.ToShortDateString & "' AND plose_POLSEKundennummer='" & R_PLOSE("PLOSEKundenNr") & "'  ", "FMZOLL")
+                End If
+
+                If True Then 'cnt Mod 10 = 0 Then
+                    txtPloseAnh_Einarbeitung.Text = cnt & " / " & dt_Main.Rows.Count
+                    Dim proz As Double = (cnt / dt_Main.Rows.Count) * 100
+                    pbPloseAnh_Proz.Value = proz
+                    lblPloseAnh_Proz.Text = proz.ToString("N2") & " %"
+                    'GroupBox12.Refresh()
+                    My.Application.DoEvents()
+                End If
+                cnt += 1
+            Next
+
+            ' ANHÄNGE WERDEN NCIHT BENÖTIGT::
+            'Alle Alangen im foglenden VZ löschen und die aktuellen kopieren
+            Dim dirAnhang = "F:\FMZoll\Maut\UTA\Anlagen\"
+            If Directory.Exists(dirAnhang) Then 'Directory.Delete(dirAnhang, True)
+                For Each f In Directory.GetFiles(dirAnhang)
+                    File.Delete(f)
+                Next
+            End If
+            If Not Directory.Exists(dirAnhang) Then Directory.CreateDirectory(dirAnhang)
+
+            For Each f In Directory.GetFiles(dir)
+                File.Copy(f, dirAnhang & (New FileInfo(f)).Name)
+            Next
+
+            'IN FMZOLL / DB MautD einfügen --> Mautbericht
+            'genPLOSEInsertMautD(dat_Sum_Von.Value.ToShortDateString, dat_Sum_Bis.Value.ToShortDateString)
+
+
+            pbPloseAnh_Proz.Value = 100
+            txtPloseAnh_Einarbeitung.Text = dt_Main.Rows.Count & " / " & dt_Main.Rows.Count
+            lblPloseAnh_Proz.Text = "100.00 %"
+
+            Return True
+        End If
+        Return False
+    End Function
+
 
     Function genPLOSEInsertMautD(von As Date, bis As Date) As Boolean
         Try
@@ -684,6 +868,197 @@ Public Class frmMDMDatenverarbetiung
         End Try
         Return ""
 
+    End Function
+    Function genUTAAttachmentByKdNr(KdNr As String, UTAKdNr As String, dir As String, bis As Date) ', PLOSEKundenNr As String, von As Date, bis As Date, dir As String)
+        Try
+
+            Dim displayFilter = False
+            Dim sqlstr As String = ""
+
+            sqlstr &= " 
+                        SELECT qryUTA_Fakturierungspositionen.KundenNr AS [Customer Nr], qryUTA_Fakturierungspositionen.Kundennummer AS [Customer ID], qryUTA_Fakturierungspositionen.[Name 1] AS [Customer name],  
+                        cast([Belegdatum] + ' ' + dbo.timeserial(Left([Lieferzeit],2) , right(Left([Lieferzeit],4),2) , Right([Lieferzeit],2)) as datetime) AS [Transaction Date],
+                        qryUTA_Fakturierungspositionen.Lieferzeit AS [Transaction Time], qryUTA_Fakturierungspositionen.Lieferland AS [Transaction Country], qryUTA_Fakturierungspositionen.Warenart AS [Product description], qryUTA_Fakturierungspositionen.Fakturierwarenart AS [Product Description ID], qryUTA_Fakturierungspositionen.Kartentyp AS [Card Type], qryUTA_Fakturierungspositionen.Kartennummer AS [Card number], 
+                        isnull([KFZ_Kennzeichen_komprimiert],isnull([KFZ_Kennzeichen],isnull([Prägetext_i_d_R_KFZ_Kennzeichen],''))) AS LicencePlateNumber, qryUTA_Fakturierungspositionen.Autobahnauffahrt AS [Entry Terminal/Direction], qryUTA_Fakturierungspositionen.Autobahnausfahrt AS [Exit Terminal Description], qryUTA_Fakturierungspositionen.Gesamtbetrag_Brutto_in_Darstellwährung AS [Transaction Amount ( EUR )]
+                        FROM 
+                        (SELECT Adressen.AdressenNr, Adressen.[Name 1], Adressen.LandKz, Adressen.Ort, Adressen.UTAExportCSV, Adressen.Rechnungsdruck, Offertenpositionen.KundenNr, Offertenpositionen.OffertenNr, Offertenpositionen.LeistungsNr, Offertenpositionen.LeistungsBez, tblUTAFakturierwarenarten.Warenart, tblUTAImport.*
+                        FROM tblUTAFakturierwarenarten INNER JOIN (((Adressen INNER JOIN tblUTAImport ON Adressen.UTAKundenNr = tblUTAImport.Kundennummer) INNER JOIN Offertenpositionen ON Adressen.AdressenNr = Offertenpositionen.KundenNr) INNER JOIN tblUTALeistungen ON (tblUTALeistungen.VERAG_LeistungsNr = Offertenpositionen.LeistungsNr) AND (tblUTALeistungen.VERAG_OffertenNr = Offertenpositionen.OffertenNr) AND (tblUTAImport.Lieferland = tblUTALeistungen.Lieferland) AND (tblUTAImport.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart
+                            WHERE Offertenpositionen.KundenNr='" & KdNr & "'
+                        ) as qryUTA_Fakturierungspositionen
+                        WHERE (((qryUTA_Fakturierungspositionen.Gesamtbetrag_Brutto_in_Darstellwährung)<>0))
+                        order by LicencePlateNumber, [Card Type]
+                      "
+
+            '  sqlstr &= " group by plose_ProduktCode"
+            ' sqlstr &= " order by plp_Land, plose_DatumTransaktion"
+
+            Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
+            If dt Is DBNull.Value Then Return ""
+            If dt.Rows.Count = 0 Then Return ""
+
+            Dim rpt As New rptPLOSE_Anhang
+
+            rpt.DataSource = dt
+
+            rpt.txtKunde.Text = KdNr & " " & New VERAG_PROG_ALLGEMEIN.cAdressen(KdNr).FullName
+            rpt.lblRgDatum.Text = datPloseAnhang.Value.ToShortDateString
+
+            rpt.GroupHeaderKz.DataField = "LicencePlateNumber" 'Gruppierung
+
+
+            rpt.txtNettoKzSum.Visible = False
+            rpt.txtNettoGesSum.Visible = False
+            rpt.txtNetto.Visible = False
+            rpt.txtNettoKatSum.Visible = False
+            rpt.lblNetto.Visible = False
+
+            rpt.txtMWSTKzSum.Visible = False
+            rpt.txtMWSTGEsSum.Visible = False
+            rpt.txtMWST.Visible = False
+            rpt.txtMWSTKatSum.Visible = False
+            rpt.lblMWST.Visible = False
+
+            rpt.lblBrutto.Text = "Total Amount ( EUR )"
+            rpt.Label4.Text = bis.ToShortDateString
+            rpt.Label2.Text = "UTA-KundenNr:"
+            rpt.TextBox1.Text = UTAKdNr
+            rpt.Label1.Text = " UTA Fleet Management Service"
+
+            rpt.lblSummeKennzeichen.Visible = False
+            rpt.lblService.Visible = False
+
+            'rpt.lblSummeKennzeichen.Location = New PointF(rpt.lblSummeKennzeichen.Location.X + 4.5, rpt.lblSummeKennzeichen.Location.Y)
+            'rpt.lblSumKategorie.Location = New PointF(rpt.lblSumKategorie.Location.X + 4.5, rpt.lblSumKategorie.Location.Y)
+            'rpt.lblGessumme.Location = New PointF(rpt.lblGessumme.Location.X + 4.5, rpt.lblGessumme.Location.Y)
+
+            Dim sumNetto As Double = 0
+            Dim sumMWST As Double = 0
+            Dim sumBrutto As Double = 0
+
+            Dim sumNettoKat As Double = 0
+            Dim sumMWSTKat As Double = 0
+            Dim sumBruttoKat As Double = 0
+
+            Dim sumNettoGes As Double = 0
+            Dim sumMWSTGes As Double = 0
+            Dim sumBruttoGes As Double = 0
+
+            Dim cntKat = 0
+            Dim cnt = 0
+            rpt.GroupFooterKat.Visible = False
+
+            AddHandler rpt.Detail.Format, Sub()
+                                              ' If cnt = 0 Then
+                                              rpt.txtKunde.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Customer ID").Value, "")
+                                              rpt.txtKunde.Text &= " " & SQL.isDbnullEmpty(rpt.Fields.Item("Customer name").Value, "")
+                                              ' End If
+
+                                              '   rpt.txtProduktBeschreibung.Text = sql.isDbnullEmpty(rpt.Fields.Item("BC_DESCR").Value, "")
+                                              Select Case "DE"
+                                                  Case "DE" : rpt.txtProdukt.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Product description").Value, "") 'sql.isDbnullEmpty(rpt.Fields.Item("plose_ProduktCode").Value, "") & " - " & sql.isDbnullEmpty(rpt.Fields.Item("plose_Produktbeschreibung").Value, "")
+                                                  Case "IT" : rpt.txtProdukt.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Product description").Value, "") 'sql.isDbnullEmpty(rpt.Fields.Item("plose_ProduktCode").Value, "") & " - " & sql.isDbnullEmpty(rpt.Fields.Item("plose_Produktbeschreibung").Value, "")
+                                                  Case Else : rpt.txtProdukt.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Product description").Value, "") 'sql.isDbnullEmpty(rpt.Fields.Item("plose_ProduktCode").Value, "") & " - " & sql.isDbnullEmpty(rpt.Fields.Item("plose_Produktbeschreibung").Value, "")
+                                              End Select
+
+                                              rpt.txtKartennummer.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Card number").Value, "")
+                                              rpt.txtEingang.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Entry Terminal/Direction").Value, "")
+                                              rpt.txtAusgang.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Exit Terminal Description").Value, "")
+                                              rpt.txtLand.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Transaction Country").Value, "")
+                                              rpt.txtDatum.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Transaction Date").Value, "")
+                                              rpt.txtEingang.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Card Type").Value, "")
+
+                                              rpt.txtNetto.Text = "" 'SQL.isDbnullEmptyDbl(rpt.Fields.Item("plose_NettobetragWaehrungAbbuchung").Value, 2, "")
+                                              rpt.txtMWST.Text = "" 'SQL.isDbnullEmptyDbl(rpt.Fields.Item("plose_MWSTBetragWaehrungAbbuchung").Value, 2, "")
+                                              rpt.txtBrutto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Transaction Amount ( EUR )").Value, 2, "")
+
+                                              sumNetto += 0 'SQL.isDbnullEmptyDbl(rpt.Fields.Item("plose_NettobetragWaehrungAbbuchung").Value, 4, 0)
+                                              sumMWST += 0 'SQL.isDbnullEmptyDbl(rpt.Fields.Item("plose_MWSTBetragWaehrungAbbuchung").Value, 4, 0)
+                                              sumBrutto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Transaction Amount ( EUR )").Value, 4, 0)
+                                              cnt += 1
+                                          End Sub
+
+            AddHandler rpt.GroupHeaderKz.Format, Sub()
+                                                     rpt.txtKennzeichen.Text = SQL.isDbnullEmpty(rpt.Fields.Item("LicencePlateNumber").Value, "")
+                                                     If rpt.txtKennzeichen.Text = "" Then rpt.lblKennzeichen.Visible = False
+                                                 End Sub
+            AddHandler rpt.GroupHeaderKat.Format, Sub()
+                                                      rpt.lblKategorie.Text = "MAUT REPORT"
+                                                  End Sub
+
+            AddHandler rpt.GroupFooterKz.Format, Sub()
+                                                     rpt.txtNettoKzSum.Text = sumNetto.ToString("N2")
+                                                     rpt.txtMWSTKzSum.Text = sumMWST.ToString("N2")
+                                                     rpt.txtBruttoKzSum.Text = sumBrutto.ToString("N2")
+                                                     sumNettoGes += sumNetto
+                                                     sumMWSTGes += sumMWST
+                                                     sumBruttoGes += sumBrutto
+
+                                                     sumNetto = 0
+                                                     sumMWST = 0
+                                                     sumBrutto = 0
+
+                                                     rpt.lblSummeKennzeichen.Text = rpt.lblSummeKennzeichen.Text.Replace("Kennzeichen", SQL.isDbnullEmpty(rpt.Fields.Item("LicencePlateNumber").Value, ""))
+                                                 End Sub
+
+
+
+            AddHandler rpt.GroupFooterKat.Format, Sub()
+                                                      sumNettoKat += sumNetto
+                                                      sumMWSTKat += sumMWST
+                                                      sumBruttoKat += sumBrutto
+                                                      sumNetto = 0
+                                                      sumMWST = 0
+                                                      sumBrutto = 0
+
+                                                      rpt.txtNettoKatSum.Text = sumNettoKat.ToString("N2")
+                                                      rpt.txtMWSTKatSum.Text = sumMWSTKat.ToString("N2")
+                                                      rpt.txtBruttoKatSum.Text = sumBruttoKat.ToString("N2")
+                                                      cntKat += 1
+                                                  End Sub
+            AddHandler rpt.ReportFooter1.Format, Sub()
+                                                     'sumNettoGes += sumNettoKat
+                                                     'sumMWSTGes += sumMWSTKat
+                                                     'sumBruttoGes += sumBruttoKat
+                                                     sumNettoKat = 0
+                                                     sumMWSTKat = 0
+                                                     sumBruttoKat = 0
+
+                                                     sumNetto = 0
+                                                     sumMWST = 0
+                                                     sumBrutto = 0
+
+                                                     rpt.txtNettoGesSum.Text = sumNettoGes.ToString("N2")
+                                                     rpt.txtMWSTGEsSum.Text = sumMWSTGes.ToString("N2")
+                                                     rpt.txtBruttoGesSum.Text = sumBruttoGes.ToString("N2")
+
+
+
+                                                     'If cntKat <= 1 Then
+                                                     '    rpt.GroupFooterKat.Visible = False
+                                                     'End If
+                                                 End Sub
+
+            'print.Viewer.LoadDocument(rpt)
+            'print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous
+            'print.Show()
+
+
+
+            Dim tmpPath = dir & "\" & KdNr & "_Maut_UTA.pdf"
+            Dim p As New GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport
+            rpt.Run(False)
+            p.NeverEmbedFonts = ""
+            p.Export(rpt.Document, tmpPath)
+
+            rpt.Dispose()
+
+            Return tmpPath
+
+        Catch ex As System.Exception
+            MsgBox(ex.Message & ex.StackTrace)
+        End Try
+        Return ""
+
     End Function
 
     Function genPLOSE_SPEDBUCH_ByKdNr(KdNr As String, PLOSEKundenNr As String, von As Date, bis As Date, ByRef SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch)
@@ -1310,5 +1685,8 @@ Public Class frmMDMDatenverarbetiung
 
     End Sub
 
+    Private Sub Button7_Click(sender As Object, e As EventArgs) Handles Button7.Click
 
+        initLieferant("UTA", sender)
+    End Sub
 End Class

SDL/zoll/usrCntlAuswertungenEV_Veranlagungen.vb

@@ -137,7 +137,7 @@ Public Class usrCntlAuswertungenEV_Veranlagungen
                                     End If
 
                                     'Handelsrechnungen
-                                    For Each rg In SQL.DLookupArray("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")
+                                    For Each rg In SQL.DLookupArray("distinct([DocCerts_DRef]) ", "[tblTelotec_PositionsdatenDokumente] As DOC inner join tblTelotec_Anmeldung As ANM ON telanm_id=[telposAbg_telanmId]", " (ANM.Refs_LRN = '" & BezugsNr & "') and [DocCerts_DocCd] IN ('N380','N325')", "FMZOLL", "DocCerts_DRef")
                                         handelsrechnungen &= semi & rg : semi = ","
                                     Next
 
@@ -152,7 +152,7 @@ Public Class usrCntlAuswertungenEV_Veranlagungen
                                     End If
 
                                     'Handelsrechnungen
-                                    For Each rg In SQL.DLookupArray("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")
+                                    For Each rg In 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", "DRef")
                                         handelsrechnungen &= semi & rg : semi = ","
                                     Next
                             End Select

SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb

@@ -224,15 +224,8 @@ Partial Class usrCntlZOLLAuswertungen
         Me.pic = New System.Windows.Forms.PictureBox()
         Me.PictureBox1 = New System.Windows.Forms.PictureBox()
         Me.TabPage2 = New System.Windows.Forms.TabPage()
-        Me.UsrCntlAuswertungenUIDPruefung1 = New SDL.usrCntlAuswertungenUIDPruefung()
-        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1 = New SDL.usrCntlAuswertungenKunden_Auftragsrueckgang()
         Me.TabPage3 = New System.Windows.Forms.TabPage()
-        Me.UsrCntlAuswertungenEV_Veranlagungen1 = New SDL.usrCntlAuswertungenEV_Veranlagungen()
-        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1 = New SDL.usrCntlAuswertungenFiskal_IntrastatMeldung()
-        Me.UsrCntlAuswertungenFiskalvertretung_42001 = New SDL.usrCntlAuswertungenFiskalvertretung_4200()
         Me.TabPage4 = New System.Windows.Forms.TabPage()
-        Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1 = New SDL.usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER()
-        Me.UsrCntlAuswertungenAufschub_Abgabenliste1 = New SDL.usrCntlAuswertungenAufschub_Abgabenliste()
         Me.TabPage5 = New System.Windows.Forms.TabPage()
         Me.Label60 = New System.Windows.Forms.Label()
         Me.GroupBox9 = New System.Windows.Forms.GroupBox()
@@ -254,6 +247,13 @@ Partial Class usrCntlZOLLAuswertungen
         Me.Button14 = New System.Windows.Forms.Button()
         Me.PictureBox8 = New System.Windows.Forms.PictureBox()
         Me.pnl = New System.Windows.Forms.Panel()
+        Me.UsrCntlAuswertungenUIDPruefung1 = New SDL.usrCntlAuswertungenUIDPruefung()
+        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1 = New SDL.usrCntlAuswertungenKunden_Auftragsrueckgang()
+        Me.UsrCntlAuswertungenEV_Veranlagungen1 = New SDL.usrCntlAuswertungenEV_Veranlagungen()
+        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1 = New SDL.usrCntlAuswertungenFiskal_IntrastatMeldung()
+        Me.UsrCntlAuswertungenFiskalvertretung_42001 = New SDL.usrCntlAuswertungenFiskalvertretung_4200()
+        Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1 = New SDL.usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER()
+        Me.UsrCntlAuswertungenAufschub_Abgabenliste1 = New SDL.usrCntlAuswertungenAufschub_Abgabenliste()
         Me.GroupBox1.SuspendLayout()
         Me.GroupBox2.SuspendLayout()
         CType(Me.picDurmaz, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -1240,7 +1240,7 @@ Partial Class usrCntlZOLLAuswertungen
         Me.tbcntr.Location = New System.Drawing.Point(0, 57)
         Me.tbcntr.Name = "tbcntr"
         Me.tbcntr.SelectedIndex = 0
-        Me.tbcntr.Size = New System.Drawing.Size(677, 1829)
+        Me.tbcntr.Size = New System.Drawing.Size(643, 1829)
         Me.tbcntr.TabIndex = 22
         '
         'TabPage1
@@ -1283,7 +1283,7 @@ Partial Class usrCntlZOLLAuswertungen
         Me.TabPage1.Location = New System.Drawing.Point(4, 22)
         Me.TabPage1.Name = "TabPage1"
         Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage1.Size = New System.Drawing.Size(669, 1803)
+        Me.TabPage1.Size = New System.Drawing.Size(635, 1803)
         Me.TabPage1.TabIndex = 0
         Me.TabPage1.Text = "Bürgschaften"
         Me.TabPage1.UseVisualStyleBackColor = True
@@ -2447,29 +2447,11 @@ Partial Class usrCntlZOLLAuswertungen
         Me.TabPage2.Location = New System.Drawing.Point(4, 22)
         Me.TabPage2.Name = "TabPage2"
         Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage2.Size = New System.Drawing.Size(686, 1803)
+        Me.TabPage2.Size = New System.Drawing.Size(652, 1803)
         Me.TabPage2.TabIndex = 1
         Me.TabPage2.Text = "Kunden"
         Me.TabPage2.UseVisualStyleBackColor = True
         '
-        'UsrCntlAuswertungenUIDPruefung1
-        '
-        Me.UsrCntlAuswertungenUIDPruefung1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlAuswertungenUIDPruefung1.Location = New System.Drawing.Point(6, 259)
-        Me.UsrCntlAuswertungenUIDPruefung1.Name = "UsrCntlAuswertungenUIDPruefung1"
-        Me.UsrCntlAuswertungenUIDPruefung1.Size = New System.Drawing.Size(708, 176)
-        Me.UsrCntlAuswertungenUIDPruefung1.TabIndex = 1
-        '
-        'UsrCntlAuswertungenKunden_Auftragsrueckgang1
-        '
-        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Location = New System.Drawing.Point(6, 18)
-        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Name = "UsrCntlAuswertungenKunden_Auftragsrueckgang1"
-        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Size = New System.Drawing.Size(0, 235)
-        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.TabIndex = 0
-        '
         'TabPage3
         '
         Me.TabPage3.Controls.Add(Me.UsrCntlAuswertungenEV_Veranlagungen1)
@@ -2478,62 +2460,22 @@ Partial Class usrCntlZOLLAuswertungen
         Me.TabPage3.Location = New System.Drawing.Point(4, 22)
         Me.TabPage3.Name = "TabPage3"
         Me.TabPage3.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage3.Size = New System.Drawing.Size(686, 1803)
+        Me.TabPage3.Size = New System.Drawing.Size(652, 1803)
         Me.TabPage3.TabIndex = 2
         Me.TabPage3.Text = "Fiskalvertretung / EV-Veranlagung"
         Me.TabPage3.UseVisualStyleBackColor = True
         '
-        'UsrCntlAuswertungenEV_Veranlagungen1
-        '
-        Me.UsrCntlAuswertungenEV_Veranlagungen1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlAuswertungenEV_Veranlagungen1.Location = New System.Drawing.Point(3, 568)
-        Me.UsrCntlAuswertungenEV_Veranlagungen1.Name = "UsrCntlAuswertungenEV_Veranlagungen1"
-        Me.UsrCntlAuswertungenEV_Veranlagungen1.Size = New System.Drawing.Size(708, 105)
-        Me.UsrCntlAuswertungenEV_Veranlagungen1.TabIndex = 2
-        '
-        'UsrCntlAuswertungenFiskal_IntrastatMeldung1
-        '
-        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Location = New System.Drawing.Point(3, 327)
-        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Name = "UsrCntlAuswertungenFiskal_IntrastatMeldung1"
-        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Size = New System.Drawing.Size(708, 235)
-        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.TabIndex = 1
-        '
-        'UsrCntlAuswertungenFiskalvertretung_42001
-        '
-        Me.UsrCntlAuswertungenFiskalvertretung_42001.BackColor = System.Drawing.Color.White
-        Me.UsrCntlAuswertungenFiskalvertretung_42001.Location = New System.Drawing.Point(3, 22)
-        Me.UsrCntlAuswertungenFiskalvertretung_42001.Name = "UsrCntlAuswertungenFiskalvertretung_42001"
-        Me.UsrCntlAuswertungenFiskalvertretung_42001.Size = New System.Drawing.Size(708, 234)
-        Me.UsrCntlAuswertungenFiskalvertretung_42001.TabIndex = 0
-        '
         'TabPage4
         '
         Me.TabPage4.Controls.Add(Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1)
         Me.TabPage4.Controls.Add(Me.UsrCntlAuswertungenAufschub_Abgabenliste1)
         Me.TabPage4.Location = New System.Drawing.Point(4, 22)
         Me.TabPage4.Name = "TabPage4"
-        Me.TabPage4.Size = New System.Drawing.Size(686, 1803)
+        Me.TabPage4.Size = New System.Drawing.Size(652, 1803)
         Me.TabPage4.TabIndex = 3
         Me.TabPage4.Text = "Aufschubdaten"
         Me.TabPage4.UseVisualStyleBackColor = True
         '
-        'UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1
-        '
-        Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.Location = New System.Drawing.Point(3, 149)
-        Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.Name = "UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1"
-        Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.Size = New System.Drawing.Size(708, 120)
-        Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.TabIndex = 1
-        '
-        'UsrCntlAuswertungenAufschub_Abgabenliste1
-        '
-        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Location = New System.Drawing.Point(3, 22)
-        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Name = "UsrCntlAuswertungenAufschub_Abgabenliste1"
-        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Size = New System.Drawing.Size(708, 180)
-        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.TabIndex = 0
-        '
         'TabPage5
         '
         Me.TabPage5.Controls.Add(Me.Label60)
@@ -2542,7 +2484,7 @@ Partial Class usrCntlZOLLAuswertungen
         Me.TabPage5.Location = New System.Drawing.Point(4, 22)
         Me.TabPage5.Name = "TabPage5"
         Me.TabPage5.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage5.Size = New System.Drawing.Size(686, 1803)
+        Me.TabPage5.Size = New System.Drawing.Size(652, 1803)
         Me.TabPage5.TabIndex = 4
         Me.TabPage5.Text = "UNISPED"
         Me.TabPage5.UseVisualStyleBackColor = True
@@ -2750,9 +2692,67 @@ Partial Class usrCntlZOLLAuswertungen
         Me.pnl.Dock = System.Windows.Forms.DockStyle.Top
         Me.pnl.Location = New System.Drawing.Point(0, 0)
         Me.pnl.Name = "pnl"
-        Me.pnl.Size = New System.Drawing.Size(677, 57)
+        Me.pnl.Size = New System.Drawing.Size(643, 57)
         Me.pnl.TabIndex = 23
         '
+        'UsrCntlAuswertungenUIDPruefung1
+        '
+        Me.UsrCntlAuswertungenUIDPruefung1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlAuswertungenUIDPruefung1.Location = New System.Drawing.Point(6, 259)
+        Me.UsrCntlAuswertungenUIDPruefung1.Name = "UsrCntlAuswertungenUIDPruefung1"
+        Me.UsrCntlAuswertungenUIDPruefung1.Size = New System.Drawing.Size(708, 176)
+        Me.UsrCntlAuswertungenUIDPruefung1.TabIndex = 1
+        '
+        'UsrCntlAuswertungenKunden_Auftragsrueckgang1
+        '
+        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Location = New System.Drawing.Point(6, 18)
+        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Name = "UsrCntlAuswertungenKunden_Auftragsrueckgang1"
+        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Size = New System.Drawing.Size(0, 235)
+        Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.TabIndex = 0
+        '
+        'UsrCntlAuswertungenEV_Veranlagungen1
+        '
+        Me.UsrCntlAuswertungenEV_Veranlagungen1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlAuswertungenEV_Veranlagungen1.Location = New System.Drawing.Point(3, 568)
+        Me.UsrCntlAuswertungenEV_Veranlagungen1.Name = "UsrCntlAuswertungenEV_Veranlagungen1"
+        Me.UsrCntlAuswertungenEV_Veranlagungen1.Size = New System.Drawing.Size(708, 105)
+        Me.UsrCntlAuswertungenEV_Veranlagungen1.TabIndex = 2
+        '
+        'UsrCntlAuswertungenFiskal_IntrastatMeldung1
+        '
+        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Location = New System.Drawing.Point(3, 327)
+        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Name = "UsrCntlAuswertungenFiskal_IntrastatMeldung1"
+        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Size = New System.Drawing.Size(708, 235)
+        Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.TabIndex = 1
+        '
+        'UsrCntlAuswertungenFiskalvertretung_42001
+        '
+        Me.UsrCntlAuswertungenFiskalvertretung_42001.BackColor = System.Drawing.Color.White
+        Me.UsrCntlAuswertungenFiskalvertretung_42001.Location = New System.Drawing.Point(3, 22)
+        Me.UsrCntlAuswertungenFiskalvertretung_42001.Name = "UsrCntlAuswertungenFiskalvertretung_42001"
+        Me.UsrCntlAuswertungenFiskalvertretung_42001.Size = New System.Drawing.Size(708, 234)
+        Me.UsrCntlAuswertungenFiskalvertretung_42001.TabIndex = 0
+        '
+        'UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1
+        '
+        Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.Location = New System.Drawing.Point(3, 149)
+        Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.Name = "UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1"
+        Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.Size = New System.Drawing.Size(708, 120)
+        Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.TabIndex = 1
+        '
+        'UsrCntlAuswertungenAufschub_Abgabenliste1
+        '
+        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Location = New System.Drawing.Point(3, 22)
+        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Name = "UsrCntlAuswertungenAufschub_Abgabenliste1"
+        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Size = New System.Drawing.Size(708, 180)
+        Me.UsrCntlAuswertungenAufschub_Abgabenliste1.TabIndex = 0
+        '
         'usrCntlZOLLAuswertungen
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -2762,7 +2762,7 @@ Partial Class usrCntlZOLLAuswertungen
         Me.Controls.Add(Me.tbcntr)
         Me.Controls.Add(Me.pnl)
         Me.Name = "usrCntlZOLLAuswertungen"
-        Me.Size = New System.Drawing.Size(677, 1445)
+        Me.Size = New System.Drawing.Size(643, 1445)
         Me.GroupBox1.ResumeLayout(False)
         Me.GroupBox1.PerformLayout()
         Me.GroupBox2.ResumeLayout(False)

VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/MyDatagridview.vb

@@ -75,6 +75,9 @@ Public Class MyDatagridview
         Me.SQL_PARAM = SQL_PARAM
         Me.RELOAD_PARAMS = RELOAD_PARAMS
     End Sub
+    Public Function GET_SQL() As String
+        Return SQL_STR
+    End Function
 
     Public Sub SetOrder()
         If Me.Columns.Count > 0 Then

VERAG_PROG_ALLGEMEIN/Classes/SQL.vb

@@ -543,12 +543,15 @@ Public Class SQL
     End Function
 
 
-    Function DLookupArray(srchField, table, where, Optional conn_art = "SDL") As List(Of String)
+    Function DLookupArray(srchField, table, where, Optional conn_art = "SDL", Optional srchFieldClearName = "") As List(Of String)
         Dim list As New List(Of String)
         Dim dt = loadDgvBySql("SELECT  " & srchField & "  FROM " & table & " WHERE " & where & "", conn_art)
+
+        If srchFieldClearName = "" Then srchFieldClearName = srchField
+
         If dt IsNot Nothing Then
             For Each r As DataRow In dt.Rows
-                list.Add(r(srchField))
+                list.Add(r(srchFieldClearName))
             Next
         End If
         Return list

VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb

@@ -75,6 +75,7 @@ Public Class cKundenErweitert
     Property kde_UIDMehrfachverwendung As Boolean = False
     Property kde_Abrechnung_SendungsdatenAusSTB As Boolean = False
     Property kde_EORIgeprueftAm As Object = Nothing
+    Property kde_AdressZusatz As Object = Nothing
 
     Dim SQL As New SQL
 
@@ -151,6 +152,7 @@ Public Class cKundenErweitert
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CreditSaveNo", kde_CreditSaveNo))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_UIDMehrfachverwendung", kde_UIDMehrfachverwendung))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_EORIgeprueftAm", kde_EORIgeprueftAm))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_AdressZusatz", kde_AdressZusatz))
 
         Return list
     End Function

VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb

@@ -83,6 +83,8 @@ Public Class cMitarbeiter
     Property mit_CSpwd As Object = Nothing
     Property mit_PersonalNr As Object = Nothing
     Property mit_timasId As Object = Nothing
+    Property mit_ATGRNAccessCode_AT51FP7 As Object = Nothing
+    Property mit_ATGRNAccessCode_AT52VA6 As Object = Nothing
 
 
 
@@ -184,6 +186,8 @@ Public Class cMitarbeiter
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_CSpwd", mit_CSpwd))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_PersonalNr", mit_PersonalNr))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_timasId", mit_timasId))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_ATGRNAccessCode_AT51FP7", mit_ATGRNAccessCode_AT51FP7))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_ATGRNAccessCode_AT52VA6", mit_ATGRNAccessCode_AT52VA6))
 
 
         Return list
@@ -375,7 +379,8 @@ Public Class cMitarbeiter
                             If Not dr.Item("mit_CSpwd") Is DBNull.Value Then Me.mit_CSpwd = dr.Item("mit_CSpwd")
                             If Not dr.Item("mit_PersonalNr") Is DBNull.Value Then Me.mit_PersonalNr = dr.Item("mit_PersonalNr")
                             If Not dr.Item("mit_timasId") Is DBNull.Value Then Me.mit_timasId = dr.Item("mit_timasId")
-
+                            If Not dr.Item("mit_ATGRNAccessCode_AT51FP7") Is DBNull.Value Then Me.mit_ATGRNAccessCode_AT51FP7 = dr.Item("mit_ATGRNAccessCode_AT51FP7")
+                            If Not dr.Item("mit_ATGRNAccessCode_AT52VA6") Is DBNull.Value Then Me.mit_ATGRNAccessCode_AT52VA6 = dr.Item("mit_ATGRNAccessCode_AT52VA6")
 
 
                         Catch ex As Exception
@@ -407,4 +412,13 @@ Public Class cMitarbeiter
 
         End Try
     End Sub
+
+
+    Public Shared Function getAccessCodeFrom_GRN(GRN)
+        Select Case If(GRN, "")
+            Case "05AT510000G000FP7" : Return If(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_ATGRNAccessCode_AT51FP7, "")
+            Case "16AT520000G000VA6" : Return If(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_ATGRNAccessCode_AT52VA6, "")
+        End Select
+        Return ""
+    End Function
 End Class

VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb

@@ -48,6 +48,7 @@ Public Class cRechnungsausgang
     Property RechnungsKundenNr As Integer
     Property RechnungsName_1 As Object = Nothing '!!!!
     Property RechnungsName_2 As Object = Nothing '!!!!
+    Property RechnungsName_AdressZusatz As Object = Nothing '!!!!
     Property RechnungsStraße As Object = Nothing
     Property RechnungsOrt As Object = Nothing
     Property RechnungsUstIdKz As Object = Nothing
@@ -281,6 +282,7 @@ Public Class cRechnungsausgang
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("RechnungsKundenNr", RechnungsKundenNr))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("RechnungsName 1", RechnungsName_1, "RechnungsName_1")) '!!!!
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("RechnungsName 2", RechnungsName_2, "RechnungsName_2")) '!!!!
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("RechnungsName_AdressZusatz", RechnungsName_AdressZusatz))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("RechnungsStraße", RechnungsStraße))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("RechnungsOrt", RechnungsOrt))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("RechnungsUstIdKz", RechnungsUstIdKz))

VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb

@@ -452,8 +452,9 @@ Public Class cCreditSafeAPI
                 End If
 
                 Dim directorsObj As Chilkat.JsonObject = reportObj.ObjectOf("directors")
-                Dim currentDirectorsArray As Chilkat.JsonArray = directorsObj.ArrayOf("currentDirectors")
+                ' Dim currentDirectorsArray As Chilkat.JsonArray = directorsObj.ArrayOf("currentDirectors")
-                If (directorsObj.LastMethodSuccess = True) And currentDirectorsArray IsNot Nothing Then
+                Dim currentDirectorsArray As Chilkat.JsonArray = json.ArrayOf("report.directors.currentDirectors")
+                If currentDirectorsArray IsNot Nothing AndAlso (directorsObj IsNot Nothing AndAlso directorsObj.LastMethodSuccess = True) Then
                     Dim i = 0
                     Dim count_i = json.SizeOfArray("report.directors.currentDirectors")
                     While i < count_i

VERAG_PROG_ALLGEMEIN/cAllgemein.vb

@@ -460,7 +460,7 @@ Public Class cNCTS_GUARANTEES
 
     Public Shared TOBB() As String = {"17TR0004000032349", "20TR0004000069756", "13TR0004000009323", "21TR0004000097157", "12TR0004000004665", "15TR0004000020917",
         "17TR0004000029518", "20DE0000000078205", "19IT01TR000003323", "21TR0004000079552", "21TR0004000078157", "21TR0004000090364", "21TR0004000092350", "20TR0004000069557",
-        "21TR0004000097564", "21TR0004000084967", "19TR0004000056358", "19TR0004000053175", "19TR0004000053356", "22TR0004000126963", "22TR0004000114169", "19TR0004000059957", "21TR0004000097555"}
+        "21TR0004000097564", "21TR0004000084967", "19TR0004000056358", "19TR0004000053175", "19TR0004000053356", "22TR0004000126963", "22TR0004000114169", "19TR0004000059957", "21TR0004000097555", "23TR0004000151181"}
     'old: {"15TR0004000020917", "12TR0004000004665", "17TR0004000032349", "17TR0004000029518"f, "21TR0004000079552", "21TR00x04000078157", "21TR0004000092350", "20TR0004000069756", "21TR0004000090364", "21TR0004000097157"}
     Public Shared OREGON() As String = {"18DE0000000073276", "19DE0000000075520", "18DE0000000075520", "15TR0004000020500", "ITTR0000000000153", "21DE0000000079716", "21DE0000000081910"}
     Public Shared VERAG() As String = {"17DE0000000071678", "05AT510000G000FP7"}