Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

2023-10-13 21:57:22 +02:00
parent f6109a662a 39cc5b0bb7
commit 0b3776e764
11 changed files with 711 additions and 67 deletions
--- a/SDL/Fakturierung/cFakturierung.vb
+++ b/SDL/Fakturierung/cFakturierung.vb
@@ -2070,7 +2070,7 @@ Public Class cFakturierung
                    RG.SAVE()


-                    If Not RG.checkRechnungsNrIsSet() Then
+                    If Not RG.checkRechnungsNrIsSet() AndAlso Not vorschau Then
                        MsgBox("Rechnungsnummer wurde nicht in Datenbank eingetragen" & vbNewLine & "Vorgang wird abgebrochen")
                        Return False
                    Else
--- a/SDL/Fakturierung/frmFaktSammelRgDrucken.vb
+++ b/SDL/Fakturierung/frmFaktSammelRgDrucken.vb
@@ -260,10 +260,13 @@ Public Class frmFaktSammelRgDrucken
            '-------------- für PDF-Sammel-Rechnung -------------- 

            If Not RechnungsNrisSet Then
-                MsgBox("Rechnungsnummer wurde nicht in Datenbank eingetragen" & vbNewLine & "Vorgang wird abgebrochen")
+                initDGV()
+                Me.Enabled = True
+                Me.Cursor = Cursors.Default
                Exit Sub
            End If

+
            If cbxZusammenfassen.Checked Then ' Gibt an, ob mehrere Sammelrechnung zusammengefasst werden sollten

                Select Case ausgabeArt
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.Designer.vb
+++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.Designer.vb
@@ -29,6 +29,34 @@ Partial Class usrcntlEORI_Antrag
        Me.btnDel = New System.Windows.Forms.Button()
        Me.Label12 = New System.Windows.Forms.Label()
        Me.cboSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Button2 = New System.Windows.Forms.Button()
+        Me.txtHerrFrau = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label26 = New System.Windows.Forms.Label()
+        Me.txtFaStNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label11 = New System.Windows.Forms.Label()
+        Me.btn = New System.Windows.Forms.Button()
+        Me.txtEmail = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label6 = New System.Windows.Forms.Label()
+        Me.txtFax = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.txtTel = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label5 = New System.Windows.Forms.Label()
+        Me.txtEori = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label3 = New System.Windows.Forms.Label()
+        Me.txtUid = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.txtPLZ = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txtAdresse1 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.txtFirma = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.lblHerrFrau = New System.Windows.Forms.Label()
+        Me.Label7 = New System.Windows.Forms.Label()
+        Me.txtLand = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label8 = New System.Windows.Forms.Label()
+        Me.Label9 = New System.Windows.Forms.Label()
+        Me.txtOrt = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label10 = New System.Windows.Forms.Label()
        CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
@@ -44,7 +72,7 @@ Partial Class usrcntlEORI_Antrag
        '
        'pic
        '
-        Me.pic.BackgroundImage = Global.SDL.My.Resources.pdf
+        Me.pic.BackgroundImage = Global.SDL.My.Resources.Resources.pdf
        Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
        Me.pic.Cursor = System.Windows.Forms.Cursors.Hand
        Me.pic.Location = New System.Drawing.Point(5, 5)
@@ -56,7 +84,7 @@ Partial Class usrcntlEORI_Antrag
        'btnDown
        '
        Me.btnDown.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnDown.BackgroundImage = Global.SDL.My.Resources.pfeil_unten
+        Me.btnDown.BackgroundImage = Global.SDL.My.Resources.Resources.pfeil_unten
        Me.btnDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
        Me.btnDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnDown.Location = New System.Drawing.Point(976, 43)
@@ -68,7 +96,7 @@ Partial Class usrcntlEORI_Antrag
        'btnUp
        '
        Me.btnUp.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnUp.BackgroundImage = Global.SDL.My.Resources.pfeil_oben
+        Me.btnUp.BackgroundImage = Global.SDL.My.Resources.Resources.pfeil_oben
        Me.btnUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
        Me.btnUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnUp.Location = New System.Drawing.Point(976, 23)
@@ -80,7 +108,7 @@ Partial Class usrcntlEORI_Antrag
        'btnDel
        '
        Me.btnDel.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnDel.BackgroundImage = Global.SDL.My.Resources.del
+        Me.btnDel.BackgroundImage = Global.SDL.My.Resources.Resources.del
        Me.btnDel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
        Me.btnDel.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnDel.Location = New System.Drawing.Point(976, 0)
@@ -109,12 +137,479 @@ Partial Class usrcntlEORI_Antrag
        Me.cboSprache.Size = New System.Drawing.Size(100, 21)
        Me.cboSprache.TabIndex = 37
        '
-        'usrcntlFiskalInfoschreiben
+        'Button2
+        '
+        Me.Button2.BackgroundImage = Global.SDL.My.Resources.Resources.person
+        Me.Button2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button2.Location = New System.Drawing.Point(760, 83)
+        Me.Button2.Name = "Button2"
+        Me.Button2.Size = New System.Drawing.Size(24, 20)
+        Me.Button2.TabIndex = 42
+        Me.Button2.UseVisualStyleBackColor = True
+        Me.Button2.Visible = False
+        '
+        'txtHerrFrau
+        '
+        Me.txtHerrFrau._DateTimeOnly = False
+        Me.txtHerrFrau._numbersOnly = False
+        Me.txtHerrFrau._numbersOnlyKommastellen = ""
+        Me.txtHerrFrau._numbersOnlyTrennzeichen = True
+        Me.txtHerrFrau._Prozent = False
+        Me.txtHerrFrau._ShortDateNew = False
+        Me.txtHerrFrau._ShortDateOnly = False
+        Me.txtHerrFrau._TimeOnly = False
+        Me.txtHerrFrau._TimeOnly_Seconds = False
+        Me.txtHerrFrau._value = Nothing
+        Me.txtHerrFrau._Waehrung = False
+        Me.txtHerrFrau._WaehrungZeichen = True
+        Me.txtHerrFrau.ForeColor = System.Drawing.Color.Black
+        Me.txtHerrFrau.Location = New System.Drawing.Point(100, 64)
+        Me.txtHerrFrau.MaxLineLength = -1
+        Me.txtHerrFrau.MaxLines_Warning = ""
+        Me.txtHerrFrau.MaxLines_Warning_Label = Nothing
+        Me.txtHerrFrau.Name = "txtHerrFrau"
+        Me.txtHerrFrau.Size = New System.Drawing.Size(684, 20)
+        Me.txtHerrFrau.TabIndex = 39
+        '
+        'Label26
+        '
+        Me.Label26.AutoSize = True
+        Me.Label26.Location = New System.Drawing.Point(16, 86)
+        Me.Label26.Name = "Label26"
+        Me.Label26.Size = New System.Drawing.Size(78, 13)
+        Me.Label26.TabIndex = 40
+        Me.Label26.Text = "Firmenwortlaut:"
+        '
+        'txtFaStNr
+        '
+        Me.txtFaStNr._DateTimeOnly = False
+        Me.txtFaStNr._numbersOnly = False
+        Me.txtFaStNr._numbersOnlyKommastellen = ""
+        Me.txtFaStNr._numbersOnlyTrennzeichen = True
+        Me.txtFaStNr._Prozent = False
+        Me.txtFaStNr._ShortDateNew = False
+        Me.txtFaStNr._ShortDateOnly = False
+        Me.txtFaStNr._TimeOnly = False
+        Me.txtFaStNr._TimeOnly_Seconds = False
+        Me.txtFaStNr._value = Nothing
+        Me.txtFaStNr._Waehrung = False
+        Me.txtFaStNr._WaehrungZeichen = True
+        Me.txtFaStNr.ForeColor = System.Drawing.Color.Black
+        Me.txtFaStNr.Location = New System.Drawing.Point(499, 185)
+        Me.txtFaStNr.MaxLineLength = -1
+        Me.txtFaStNr.MaxLines_Warning = ""
+        Me.txtFaStNr.MaxLines_Warning_Label = Nothing
+        Me.txtFaStNr.Name = "txtFaStNr"
+        Me.txtFaStNr.Size = New System.Drawing.Size(310, 20)
+        Me.txtFaStNr.TabIndex = 58
+        '
+        'Label11
+        '
+        Me.Label11.AutoSize = True
+        Me.Label11.Location = New System.Drawing.Point(428, 188)
+        Me.Label11.Name = "Label11"
+        Me.Label11.Size = New System.Drawing.Size(56, 13)
+        Me.Label11.TabIndex = 57
+        Me.Label11.Text = "FA-St.-Nr.:"
+        '
+        'btn
+        '
+        Me.btn.BackgroundImage = Global.SDL.My.Resources.Resources.search
+        Me.btn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btn.Location = New System.Drawing.Point(783, 83)
+        Me.btn.Name = "btn"
+        Me.btn.Size = New System.Drawing.Size(26, 20)
+        Me.btn.TabIndex = 43
+        Me.btn.UseVisualStyleBackColor = True
+        '
+        'txtEmail
+        '
+        Me.txtEmail._DateTimeOnly = False
+        Me.txtEmail._numbersOnly = False
+        Me.txtEmail._numbersOnlyKommastellen = ""
+        Me.txtEmail._numbersOnlyTrennzeichen = True
+        Me.txtEmail._Prozent = False
+        Me.txtEmail._ShortDateNew = False
+        Me.txtEmail._ShortDateOnly = False
+        Me.txtEmail._TimeOnly = False
+        Me.txtEmail._TimeOnly_Seconds = False
+        Me.txtEmail._value = Nothing
+        Me.txtEmail._Waehrung = False
+        Me.txtEmail._WaehrungZeichen = True
+        Me.txtEmail.ForeColor = System.Drawing.Color.Black
+        Me.txtEmail.Location = New System.Drawing.Point(100, 185)
+        Me.txtEmail.MaxLineLength = -1
+        Me.txtEmail.MaxLines_Warning = ""
+        Me.txtEmail.MaxLines_Warning_Label = Nothing
+        Me.txtEmail.Name = "txtEmail"
+        Me.txtEmail.Size = New System.Drawing.Size(310, 20)
+        Me.txtEmail.TabIndex = 56
+        '
+        'Label6
+        '
+        Me.Label6.AutoSize = True
+        Me.Label6.Location = New System.Drawing.Point(16, 188)
+        Me.Label6.Name = "Label6"
+        Me.Label6.Size = New System.Drawing.Size(39, 13)
+        Me.Label6.TabIndex = 55
+        Me.Label6.Text = "E-Mail:"
+        '
+        'txtFax
+        '
+        Me.txtFax._DateTimeOnly = False
+        Me.txtFax._numbersOnly = False
+        Me.txtFax._numbersOnlyKommastellen = ""
+        Me.txtFax._numbersOnlyTrennzeichen = True
+        Me.txtFax._Prozent = False
+        Me.txtFax._ShortDateNew = False
+        Me.txtFax._ShortDateOnly = False
+        Me.txtFax._TimeOnly = False
+        Me.txtFax._TimeOnly_Seconds = False
+        Me.txtFax._value = Nothing
+        Me.txtFax._Waehrung = False
+        Me.txtFax._WaehrungZeichen = True
+        Me.txtFax.ForeColor = System.Drawing.Color.Black
+        Me.txtFax.Location = New System.Drawing.Point(499, 166)
+        Me.txtFax.MaxLineLength = -1
+        Me.txtFax.MaxLines_Warning = ""
+        Me.txtFax.MaxLines_Warning_Label = Nothing
+        Me.txtFax.Name = "txtFax"
+        Me.txtFax.Size = New System.Drawing.Size(310, 20)
+        Me.txtFax.TabIndex = 54
+        '
+        'Label4
+        '
+        Me.Label4.AutoSize = True
+        Me.Label4.Location = New System.Drawing.Point(428, 169)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(27, 13)
+        Me.Label4.TabIndex = 53
+        Me.Label4.Text = "Fax:"
+        '
+        'txtTel
+        '
+        Me.txtTel._DateTimeOnly = False
+        Me.txtTel._numbersOnly = False
+        Me.txtTel._numbersOnlyKommastellen = ""
+        Me.txtTel._numbersOnlyTrennzeichen = True
+        Me.txtTel._Prozent = False
+        Me.txtTel._ShortDateNew = False
+        Me.txtTel._ShortDateOnly = False
+        Me.txtTel._TimeOnly = False
+        Me.txtTel._TimeOnly_Seconds = False
+        Me.txtTel._value = Nothing
+        Me.txtTel._Waehrung = False
+        Me.txtTel._WaehrungZeichen = True
+        Me.txtTel.ForeColor = System.Drawing.Color.Black
+        Me.txtTel.Location = New System.Drawing.Point(100, 166)
+        Me.txtTel.MaxLineLength = -1
+        Me.txtTel.MaxLines_Warning = ""
+        Me.txtTel.MaxLines_Warning_Label = Nothing
+        Me.txtTel.Name = "txtTel"
+        Me.txtTel.Size = New System.Drawing.Size(310, 20)
+        Me.txtTel.TabIndex = 52
+        '
+        'Label5
+        '
+        Me.Label5.AutoSize = True
+        Me.Label5.Location = New System.Drawing.Point(16, 169)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(28, 13)
+        Me.Label5.TabIndex = 51
+        Me.Label5.Text = "Tel.:"
+        '
+        'txtEori
+        '
+        Me.txtEori._DateTimeOnly = False
+        Me.txtEori._numbersOnly = False
+        Me.txtEori._numbersOnlyKommastellen = ""
+        Me.txtEori._numbersOnlyTrennzeichen = True
+        Me.txtEori._Prozent = False
+        Me.txtEori._ShortDateNew = False
+        Me.txtEori._ShortDateOnly = False
+        Me.txtEori._TimeOnly = False
+        Me.txtEori._TimeOnly_Seconds = False
+        Me.txtEori._value = Nothing
+        Me.txtEori._Waehrung = False
+        Me.txtEori._WaehrungZeichen = True
+        Me.txtEori.ForeColor = System.Drawing.Color.Black
+        Me.txtEori.Location = New System.Drawing.Point(499, 147)
+        Me.txtEori.MaxLineLength = -1
+        Me.txtEori.MaxLines_Warning = ""
+        Me.txtEori.MaxLines_Warning_Label = Nothing
+        Me.txtEori.Name = "txtEori"
+        Me.txtEori.Size = New System.Drawing.Size(310, 20)
+        Me.txtEori.TabIndex = 50
+        '
+        'Label3
+        '
+        Me.Label3.AutoSize = True
+        Me.Label3.Location = New System.Drawing.Point(428, 150)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(50, 13)
+        Me.Label3.TabIndex = 49
+        Me.Label3.Text = "EORI-Nr:"
+        '
+        'txtUid
+        '
+        Me.txtUid._DateTimeOnly = False
+        Me.txtUid._numbersOnly = False
+        Me.txtUid._numbersOnlyKommastellen = ""
+        Me.txtUid._numbersOnlyTrennzeichen = True
+        Me.txtUid._Prozent = False
+        Me.txtUid._ShortDateNew = False
+        Me.txtUid._ShortDateOnly = False
+        Me.txtUid._TimeOnly = False
+        Me.txtUid._TimeOnly_Seconds = False
+        Me.txtUid._value = Nothing
+        Me.txtUid._Waehrung = False
+        Me.txtUid._WaehrungZeichen = True
+        Me.txtUid.ForeColor = System.Drawing.Color.Black
+        Me.txtUid.Location = New System.Drawing.Point(100, 147)
+        Me.txtUid.MaxLineLength = -1
+        Me.txtUid.MaxLines_Warning = ""
+        Me.txtUid.MaxLines_Warning_Label = Nothing
+        Me.txtUid.Name = "txtUid"
+        Me.txtUid.Size = New System.Drawing.Size(310, 20)
+        Me.txtUid.TabIndex = 48
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.Location = New System.Drawing.Point(16, 150)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(43, 13)
+        Me.Label2.TabIndex = 47
+        Me.Label2.Text = "UID-Nr:"
+        '
+        'txtPLZ
+        '
+        Me.txtPLZ._DateTimeOnly = False
+        Me.txtPLZ._numbersOnly = False
+        Me.txtPLZ._numbersOnlyKommastellen = ""
+        Me.txtPLZ._numbersOnlyTrennzeichen = True
+        Me.txtPLZ._Prozent = False
+        Me.txtPLZ._ShortDateNew = False
+        Me.txtPLZ._ShortDateOnly = False
+        Me.txtPLZ._TimeOnly = False
+        Me.txtPLZ._TimeOnly_Seconds = False
+        Me.txtPLZ._value = Nothing
+        Me.txtPLZ._Waehrung = False
+        Me.txtPLZ._WaehrungZeichen = True
+        Me.txtPLZ.ForeColor = System.Drawing.Color.Black
+        Me.txtPLZ.Location = New System.Drawing.Point(143, 121)
+        Me.txtPLZ.MaxLineLength = -1
+        Me.txtPLZ.MaxLines_Warning = ""
+        Me.txtPLZ.MaxLines_Warning_Label = Nothing
+        Me.txtPLZ.Name = "txtPLZ"
+        Me.txtPLZ.Size = New System.Drawing.Size(72, 20)
+        Me.txtPLZ.TabIndex = 46
+        '
+        'txtAdresse1
+        '
+        Me.txtAdresse1._DateTimeOnly = False
+        Me.txtAdresse1._numbersOnly = False
+        Me.txtAdresse1._numbersOnlyKommastellen = ""
+        Me.txtAdresse1._numbersOnlyTrennzeichen = True
+        Me.txtAdresse1._Prozent = False
+        Me.txtAdresse1._ShortDateNew = False
+        Me.txtAdresse1._ShortDateOnly = False
+        Me.txtAdresse1._TimeOnly = False
+        Me.txtAdresse1._TimeOnly_Seconds = False
+        Me.txtAdresse1._value = Nothing
+        Me.txtAdresse1._Waehrung = False
+        Me.txtAdresse1._WaehrungZeichen = True
+        Me.txtAdresse1.ForeColor = System.Drawing.Color.Black
+        Me.txtAdresse1.Location = New System.Drawing.Point(100, 102)
+        Me.txtAdresse1.MaxLineLength = -1
+        Me.txtAdresse1.MaxLines_Warning = ""
+        Me.txtAdresse1.MaxLines_Warning_Label = Nothing
+        Me.txtAdresse1.Name = "txtAdresse1"
+        Me.txtAdresse1.Size = New System.Drawing.Size(310, 20)
+        Me.txtAdresse1.TabIndex = 45
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(16, 105)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(42, 13)
+        Me.Label1.TabIndex = 44
+        Me.Label1.Text = "Strasse"
+        '
+        'txtFirma
+        '
+        Me.txtFirma._DateTimeOnly = False
+        Me.txtFirma._numbersOnly = False
+        Me.txtFirma._numbersOnlyKommastellen = ""
+        Me.txtFirma._numbersOnlyTrennzeichen = True
+        Me.txtFirma._Prozent = False
+        Me.txtFirma._ShortDateNew = False
+        Me.txtFirma._ShortDateOnly = False
+        Me.txtFirma._TimeOnly = False
+        Me.txtFirma._TimeOnly_Seconds = False
+        Me.txtFirma._value = Nothing
+        Me.txtFirma._Waehrung = False
+        Me.txtFirma._WaehrungZeichen = True
+        Me.txtFirma.ForeColor = System.Drawing.Color.Black
+        Me.txtFirma.Location = New System.Drawing.Point(100, 83)
+        Me.txtFirma.MaxLineLength = -1
+        Me.txtFirma.MaxLines_Warning = ""
+        Me.txtFirma.MaxLines_Warning_Label = Nothing
+        Me.txtFirma.Name = "txtFirma"
+        Me.txtFirma.Size = New System.Drawing.Size(684, 20)
+        Me.txtFirma.TabIndex = 41
+        '
+        'lblHerrFrau
+        '
+        Me.lblHerrFrau.AutoSize = True
+        Me.lblHerrFrau.Location = New System.Drawing.Point(16, 67)
+        Me.lblHerrFrau.Name = "lblHerrFrau"
+        Me.lblHerrFrau.Size = New System.Drawing.Size(56, 13)
+        Me.lblHerrFrau.TabIndex = 38
+        Me.lblHerrFrau.Text = "Herr/Frau:"
+        '
+        'Label7
+        '
+        Me.Label7.AutoSize = True
+        Me.Label7.Location = New System.Drawing.Point(17, 124)
+        Me.Label7.Name = "Label7"
+        Me.Label7.Size = New System.Drawing.Size(27, 13)
+        Me.Label7.TabIndex = 59
+        Me.Label7.Text = "PLZ"
+        '
+        'txtLand
+        '
+        Me.txtLand._DateTimeOnly = False
+        Me.txtLand._numbersOnly = False
+        Me.txtLand._numbersOnlyKommastellen = ""
+        Me.txtLand._numbersOnlyTrennzeichen = True
+        Me.txtLand._Prozent = False
+        Me.txtLand._ShortDateNew = False
+        Me.txtLand._ShortDateOnly = False
+        Me.txtLand._TimeOnly = False
+        Me.txtLand._TimeOnly_Seconds = False
+        Me.txtLand._value = Nothing
+        Me.txtLand._Waehrung = False
+        Me.txtLand._WaehrungZeichen = True
+        Me.txtLand.ForeColor = System.Drawing.Color.Black
+        Me.txtLand.Location = New System.Drawing.Point(100, 121)
+        Me.txtLand.MaxLineLength = -1
+        Me.txtLand.MaxLines_Warning = ""
+        Me.txtLand.MaxLines_Warning_Label = Nothing
+        Me.txtLand.Name = "txtLand"
+        Me.txtLand.Size = New System.Drawing.Size(32, 20)
+        Me.txtLand.TabIndex = 60
+        '
+        'MyTextBox2
+        '
+        Me.MyTextBox2._DateTimeOnly = False
+        Me.MyTextBox2._numbersOnly = False
+        Me.MyTextBox2._numbersOnlyKommastellen = ""
+        Me.MyTextBox2._numbersOnlyTrennzeichen = True
+        Me.MyTextBox2._Prozent = False
+        Me.MyTextBox2._ShortDateNew = False
+        Me.MyTextBox2._ShortDateOnly = False
+        Me.MyTextBox2._TimeOnly = False
+        Me.MyTextBox2._TimeOnly_Seconds = False
+        Me.MyTextBox2._value = Nothing
+        Me.MyTextBox2._Waehrung = False
+        Me.MyTextBox2._WaehrungZeichen = True
+        Me.MyTextBox2.ForeColor = System.Drawing.Color.Black
+        Me.MyTextBox2.Location = New System.Drawing.Point(499, 102)
+        Me.MyTextBox2.MaxLineLength = -1
+        Me.MyTextBox2.MaxLines_Warning = ""
+        Me.MyTextBox2.MaxLines_Warning_Label = Nothing
+        Me.MyTextBox2.Name = "MyTextBox2"
+        Me.MyTextBox2.Size = New System.Drawing.Size(55, 20)
+        Me.MyTextBox2.TabIndex = 61
+        '
+        'Label8
+        '
+        Me.Label8.AutoSize = True
+        Me.Label8.Location = New System.Drawing.Point(428, 105)
+        Me.Label8.Name = "Label8"
+        Me.Label8.Size = New System.Drawing.Size(69, 13)
+        Me.Label8.TabIndex = 62
+        Me.Label8.Text = "Hausnummer"
+        '
+        'Label9
+        '
+        Me.Label9.AutoSize = True
+        Me.Label9.Location = New System.Drawing.Point(235, 124)
+        Me.Label9.Name = "Label9"
+        Me.Label9.Size = New System.Drawing.Size(21, 13)
+        Me.Label9.TabIndex = 63
+        Me.Label9.Text = "Ort"
+        '
+        'txtOrt
+        '
+        Me.txtOrt._DateTimeOnly = False
+        Me.txtOrt._numbersOnly = False
+        Me.txtOrt._numbersOnlyKommastellen = ""
+        Me.txtOrt._numbersOnlyTrennzeichen = True
+        Me.txtOrt._Prozent = False
+        Me.txtOrt._ShortDateNew = False
+        Me.txtOrt._ShortDateOnly = False
+        Me.txtOrt._TimeOnly = False
+        Me.txtOrt._TimeOnly_Seconds = False
+        Me.txtOrt._value = Nothing
+        Me.txtOrt._Waehrung = False
+        Me.txtOrt._WaehrungZeichen = True
+        Me.txtOrt.ForeColor = System.Drawing.Color.Black
+        Me.txtOrt.Location = New System.Drawing.Point(262, 121)
+        Me.txtOrt.MaxLineLength = -1
+        Me.txtOrt.MaxLines_Warning = ""
+        Me.txtOrt.MaxLines_Warning_Label = Nothing
+        Me.txtOrt.Name = "txtOrt"
+        Me.txtOrt.Size = New System.Drawing.Size(148, 20)
+        Me.txtOrt.TabIndex = 64
+        '
+        'Label10
+        '
+        Me.Label10.AutoSize = True
+        Me.Label10.Location = New System.Drawing.Point(132, 124)
+        Me.Label10.Name = "Label10"
+        Me.Label10.Size = New System.Drawing.Size(10, 13)
+        Me.Label10.TabIndex = 65
+        Me.Label10.Text = "-"
+        '
+        'usrcntlEORI_Antrag
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.BackColor = System.Drawing.Color.WhiteSmoke
        Me.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Controls.Add(Me.Label10)
+        Me.Controls.Add(Me.txtOrt)
+        Me.Controls.Add(Me.Label9)
+        Me.Controls.Add(Me.Label8)
+        Me.Controls.Add(Me.MyTextBox2)
+        Me.Controls.Add(Me.txtLand)
+        Me.Controls.Add(Me.Label7)
+        Me.Controls.Add(Me.Button2)
+        Me.Controls.Add(Me.txtHerrFrau)
+        Me.Controls.Add(Me.Label26)
+        Me.Controls.Add(Me.txtFaStNr)
+        Me.Controls.Add(Me.Label11)
+        Me.Controls.Add(Me.btn)
+        Me.Controls.Add(Me.txtEmail)
+        Me.Controls.Add(Me.Label6)
+        Me.Controls.Add(Me.txtFax)
+        Me.Controls.Add(Me.Label4)
+        Me.Controls.Add(Me.txtTel)
+        Me.Controls.Add(Me.Label5)
+        Me.Controls.Add(Me.txtEori)
+        Me.Controls.Add(Me.Label3)
+        Me.Controls.Add(Me.txtUid)
+        Me.Controls.Add(Me.Label2)
+        Me.Controls.Add(Me.txtPLZ)
+        Me.Controls.Add(Me.txtAdresse1)
+        Me.Controls.Add(Me.Label1)
+        Me.Controls.Add(Me.txtFirma)
+        Me.Controls.Add(Me.lblHerrFrau)
        Me.Controls.Add(Me.Label12)
        Me.Controls.Add(Me.cboSprache)
        Me.Controls.Add(Me.btnDown)
@@ -122,8 +617,8 @@ Partial Class usrcntlEORI_Antrag
        Me.Controls.Add(Me.btnDel)
        Me.Controls.Add(Me.pic)
        Me.Controls.Add(Me.lblText)
-        Me.Name = "usrcntlFiskalInfoschreiben"
-        Me.Size = New System.Drawing.Size(1000, 64)
+        Me.Name = "usrcntlEORI_Antrag"
+        Me.Size = New System.Drawing.Size(1000, 235)
        CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()
@@ -136,5 +631,32 @@ Partial Class usrcntlEORI_Antrag
    Friend WithEvents btnDel As System.Windows.Forms.Button
    Friend WithEvents Label12 As System.Windows.Forms.Label
    Friend WithEvents cboSprache As VERAG_PROG_ALLGEMEIN.MyComboBox
-
+    Friend WithEvents Button2 As Button
+    Friend WithEvents txtHerrFrau As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents Label26 As Label
+    Friend WithEvents txtFaStNr As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents Label11 As Label
+    Friend WithEvents btn As Button
+    Friend WithEvents txtEmail As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents Label6 As Label
+    Friend WithEvents txtFax As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents Label4 As Label
+    Friend WithEvents txtTel As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents Label5 As Label
+    Friend WithEvents txtEori As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents Label3 As Label
+    Friend WithEvents txtUid As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents Label2 As Label
+    Friend WithEvents txtPLZ As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents txtAdresse1 As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents Label1 As Label
+    Friend WithEvents txtFirma As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents lblHerrFrau As Label
+    Friend WithEvents Label7 As Label
+    Friend WithEvents txtLand As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents MyTextBox2 As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents Label8 As Label
+    Friend WithEvents Label9 As Label
+    Friend WithEvents txtOrt As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents Label10 As Label
 End Class
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.vb
+++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.vb
@@ -3,7 +3,7 @@

    Property BEZEICHNUNG = ""
    '  Property DS_ORDNER = ""
-
+    Public Event KDNR_CHANGED(kdnr)
    Public Event DELETE(c As Control)
    Public Event MOVE_UP(c As Control)
    Public Event MOVE_DOWN(c As Control)
@@ -12,7 +12,7 @@
    Public KdNR As Integer = -1
    Public Sub ChangeKDNr(kdnr As Integer) _
       Implements FormualrInterface.ChangeKDNr
-        'nix...
+        initKdNR(kdnr)
    End Sub

    Sub New(BEZEICHNUNG As String, DS_ORDNER As String, Optional displayName As String = "")
@@ -63,7 +63,43 @@


        If KdNR > 0 Then
-            ' initKdNR(KdNR)
+            initKdNR(KdNR)
        End If
    End Sub
+
+    Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click
+        Dim kdsrch As New SDL.frmKundenSuche
+        'Panel1.Enabled = False
+        If kdsrch.ShowDialog(Me) = System.Windows.Forms.DialogResult.OK Then
+            If IsNumeric(kdsrch.kundenNrSearch.Text) Then
+                initKdNR(kdsrch.kundenNrSearch.Text)
+                'RaiseEvent ChangeKDNr(KdNR)
+            End If
+        End If
+        '  Panel1.Enabled = True
+    End Sub
+
+    Public Sub initKdNR(KdNR)
+        If KdNR > 0 Then
+            Me.KdNR = KdNR
+
+            Dim KUNDE As New VERAG_PROG_ALLGEMEIN.cKunde(KdNR)
+            Dim ADRESSE As New VERAG_PROG_ALLGEMEIN.cAdressen(KdNR)
+
+            txtFirma.Text = If(ADRESSE.Name_1, "") & If(If(ADRESSE.Name_2, "") <> "", " " & ADRESSE.Name_2, "")
+            txtAdresse1.Text = If(ADRESSE.Straße, "")
+            txtLand.Text = If(ADRESSE.LandKz, "")
+            txtPLZ.Text = If(ADRESSE.PLZ, "")
+            txtOrt.Text = If(ADRESSE.Ort, "").ToString.Trim
+            txtUid.Text = If(ADRESSE.UstIdKz, "") & If(ADRESSE.UstIdNr, "")
+            txtEori.Text = If(KUNDE.EORITIN, "")
+            txtTel.Text = If(ADRESSE.Telefon, "")
+            txtEmail.Text = If(ADRESSE.E_Mail, "")
+            '  txtAnsprechpartnerVERAG.Text = If(ADRESSE.Ansprechpartner, "")
+        Else
+            'txtFirma.Text = KdFirma
+        End If
+
+    End Sub
+
 End Class
--- a/SDL/Formulare/KDFormulare/frmFormulare.vb
+++ b/SDL/Formulare/KDFormulare/frmFormulare.vb
@@ -4177,19 +4177,40 @@ Public Class FormularManagerNEU

    Shared Function EORI_Antrag(usrCntl As usrcntlEORI_Antrag) As String

-        'Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "EORI_Antrag")
-        'Return DS.GET_TOP1_PATH(False)
+        Dim fm As New VERAG_PROG_ALLGEMEIN.cFormularManager
+
+        Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues)
+
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEori.Text, 25, 84, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
+
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFirma.Text, 25, 103, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
+
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtHerrFrau.Text, 25, 110, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
+
+
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtOrt.Text, 25, 216, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse1.Text, 25, 226, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.MyTextBox2.Text, 25, 238, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtLand.Text, 25, 205, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtPLZ.Text, 45, 205, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
+
+
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtTel.Text, 25, 191, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
+        'listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtUid.Text, 25, 185, 70, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) - muss auf 2ten Seite gedruckt werden!
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEmail.Text, 25, 175, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
+
+
+
        Select Case usrCntl.cboSprache._value
            Case "EN"
-                Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "EORI_Antrag_EN")
-                Return DS.GET_TOP1_PATH(False)
+                Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "EORI_Antrag_EN", listTowrite)

            Case Else
-                Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "EORI_Antrag")
-                Return DS.GET_TOP1_PATH(False)
-
+                Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "EORI_Antrag", listTowrite)
        End Select

+        Return ""
+
    End Function


--- a/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb
+++ b/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb
@@ -130,6 +130,7 @@ Partial Class frmKundenUebersichtZOLL
        Me.AnDakosyÜbertragenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.AufschubEORIBearbeitenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.SYSKAÜbertragToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.mneBearbeiten = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
        Me.pnlTop = New System.Windows.Forms.Panel()
        Me.cbx = New System.Windows.Forms.CheckBox()
@@ -147,7 +148,7 @@ Partial Class frmKundenUebersichtZOLL
        Me.PDFLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.mneBearbeiten = New System.Windows.Forms.ToolStripMenuItem()
+        Me.EORIAntragToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ContextMenuStrip1.SuspendLayout()
        Me.tabZolltarife.SuspendLayout()
        Me.tabKundendaten.SuspendLayout()
@@ -1104,7 +1105,7 @@ Partial Class frmKundenUebersichtZOLL
        'mneFormulare
        '
        Me.mneFormulare.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.mneFormulare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MANAGERToolStripMenuItem, Me.ToolStripSeparator3, Me.ToolStripMenuItem4, Me.ToolStripMenuItem9, Me.ToolStripMenuItem10, Me.ToolStripMenuItem14, Me.ToolStripMenuItem16, Me.ToolStripMenuItem17, Me.ToolStripMenuItem19})
+        Me.mneFormulare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MANAGERToolStripMenuItem, Me.ToolStripSeparator3, Me.ToolStripMenuItem4, Me.ToolStripMenuItem9, Me.ToolStripMenuItem10, Me.ToolStripMenuItem14, Me.ToolStripMenuItem16, Me.ToolStripMenuItem17, Me.ToolStripMenuItem19, Me.EORIAntragToolStripMenuItem})
        Me.mneFormulare.Enabled = False
        Me.mneFormulare.Font = New System.Drawing.Font("Segoe UI", 9.0!)
        Me.mneFormulare.ForeColor = System.Drawing.Color.White
@@ -1287,6 +1288,20 @@ Partial Class frmKundenUebersichtZOLL
        Me.SYSKAÜbertragToolStripMenuItem.Size = New System.Drawing.Size(217, 22)
        Me.SYSKAÜbertragToolStripMenuItem.Text = "SYSKA übertragen"
        '
+        'mneBearbeiten
+        '
+        Me.mneBearbeiten.Enabled = False
+        Me.mneBearbeiten.ForeColor = System.Drawing.Color.White
+        Me.mneBearbeiten.Image = Global.SDL.My.Resources.Resources.stift1
+        Me.mneBearbeiten.ImageAlign = System.Drawing.ContentAlignment.TopCenter
+        Me.mneBearbeiten.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
+        Me.mneBearbeiten.Margin = New System.Windows.Forms.Padding(0, 5, 0, 0)
+        Me.mneBearbeiten.Name = "mneBearbeiten"
+        Me.mneBearbeiten.Size = New System.Drawing.Size(107, 44)
+        Me.mneBearbeiten.Text = "Bearbeiten"
+        Me.mneBearbeiten.TextAlign = System.Drawing.ContentAlignment.BottomCenter
+        Me.mneBearbeiten.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
+        '
        'ToolStripMenuItem1
        '
        Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1"
@@ -1454,19 +1469,11 @@ Partial Class frmKundenUebersichtZOLL
        Me.DataGridViewTextBoxColumn2.HeaderText = "KundenNr"
        Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2"
        '
-        'mneBearbeiten
+        'EORIAntragToolStripMenuItem
        '
-        Me.mneBearbeiten.Enabled = False
-        Me.mneBearbeiten.ForeColor = System.Drawing.Color.White
-        Me.mneBearbeiten.Image = Global.SDL.My.Resources.Resources.stift1
-        Me.mneBearbeiten.ImageAlign = System.Drawing.ContentAlignment.TopCenter
-        Me.mneBearbeiten.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
-        Me.mneBearbeiten.Margin = New System.Windows.Forms.Padding(0, 5, 0, 0)
-        Me.mneBearbeiten.Name = "mneBearbeiten"
-        Me.mneBearbeiten.Size = New System.Drawing.Size(107, 44)
-        Me.mneBearbeiten.Text = "Bearbeiten"
-        Me.mneBearbeiten.TextAlign = System.Drawing.ContentAlignment.BottomCenter
-        Me.mneBearbeiten.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
+        Me.EORIAntragToolStripMenuItem.Name = "EORIAntragToolStripMenuItem"
+        Me.EORIAntragToolStripMenuItem.Size = New System.Drawing.Size(242, 22)
+        Me.EORIAntragToolStripMenuItem.Text = "EORI Antrag"
        '
        'frmKundenUebersichtZOLL
        '
@@ -1636,4 +1643,5 @@ Partial Class frmKundenUebersichtZOLL
    Friend WithEvents tbFiskaluebersicht As TabPage
    Friend WithEvents UsrcntlFiskaluebersicht1 As usrcntlFiskaluebersicht
    Friend WithEvents mneBearbeiten As ToolStripMenuItem
+    Friend WithEvents EORIAntragToolStripMenuItem As ToolStripMenuItem
 End Class
--- a/SDL/kunden/frmKundenUebersichtZOLL.vb
+++ b/SDL/kunden/frmKundenUebersichtZOLL.vb
@@ -1416,7 +1416,9 @@ Public Class frmKundenUebersichtZOLL
        btnRgPdf.Enabled = (dgvRg.SelectedRows.Count > 0)
    End Sub

-
+    Private Sub EORIAntragToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EORIAntragToolStripMenuItem.Click
+        SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.EORI_Antrag, kdNr, {})
+    End Sub
 End Class


--- a/SDL/kunden/frmKundenUebersichtZollRgDetails.vb
+++ b/SDL/kunden/frmKundenUebersichtZollRgDetails.vb
@@ -28,6 +28,7 @@ Public Class frmKundenUebersichtZollRgDetails
        lblOrt.Text = dt("RechnungsOrt").ToString
        lblUID.Text = dt("RechnungsUstIdKz").ToString & " " & dt("RechnungsUstIdNr").ToString
        lblSteuerbetrag.Text = CDbl(dt("ErgSteuerbetrag")).ToString("N2", CultureInfo.CurrentCulture)
+        lblAbfDat.Text = dt("Abfertigungsdatum").ToString

        lblAbfNr.Text = dt("FilialenNr").ToString & " " & dt("AbfertigungsNr").ToString
        filialeTmp = dt("FilialenNr").ToString
--- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb
+++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb
@@ -259,6 +259,8 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.Label33 = New System.Windows.Forms.Label()
        Me.Label84 = New System.Windows.Forms.Label()
        Me.GroupBox3 = New System.Windows.Forms.GroupBox()
+        Me.Label100 = New System.Windows.Forms.Label()
+        Me.txtAdresseZusatz = New System.Windows.Forms.TextBox()
        Me.cbxUIDMehrfachverwendung = New System.Windows.Forms.CheckBox()
        Me.btnCreditsafe = New System.Windows.Forms.Button()
        Me.Button13 = New System.Windows.Forms.Button()
@@ -334,8 +336,6 @@ 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()
@@ -3595,6 +3595,25 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.GroupBox3.TabStop = False
        Me.GroupBox3.Text = "Firma"
        '
+        '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:"
+        '
+        '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
+        '
        'cbxUIDMehrfachverwendung
        '
        Me.cbxUIDMehrfachverwendung.AutoSize = True
@@ -4486,25 +4505,6 @@ 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!)
--- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb
+++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb
@@ -414,7 +414,7 @@ Public Class usrcntlKundeBearbeitenFull
                    If cbxLandKz._value = "A" Then
                        kundenkreis = "2200250-2209999" 'AT-Kundenkreis
                    Else
-                        kundenkreis = "2256000-2259990" 'ausl.Kundenkreis
+                        kundenkreis = "2262630-2291290" 'ausl.Kundenkreis
                    End If
            End Select