MDM, CHAT, MSE_API

2024-09-27 09:56:50 +02:00
parent 6da48a608c
commit ba73d87854
14 changed files with 412 additions and 255 deletions
--- a/SDL/Formulare/KDFormulare/frmFormulare.vb
+++ b/SDL/Formulare/KDFormulare/frmFormulare.vb
@@ -8,7 +8,7 @@ Imports System.Reflection
 Imports System.Text.RegularExpressions
 Imports System.Windows.Documents
 Imports VERAG_PROG_ALLGEMEIN
-Imports sun.jdbc
+

 Public Class frmFormulare
    Dim isSingleForm = False
@@ -1703,6 +1703,8 @@ Public Class FormularManagerNEU

            Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues)
            Dim listItem2 As New List(Of VERAG_PROG_ALLGEMEIN.MyListItem)
+
+            Dim functionCEO = IIf(usrCntl.cboLand._value = "FR" Or usrCntl.cboLand._value = "SI", "DIRECTOR", "CEO")
            Dim foundingDateIsValid As Boolean = False
            Dim privateFirma As Boolean = False
            If usrCntl.txtGruendungsdat.Text <> "" AndAlso IsDate(usrCntl.txtGruendungsdat.Text) Then foundingDateIsValid = True
@@ -1710,104 +1712,117 @@ Public Class FormularManagerNEU


            For Each item In list
+                If usrCntl.cboLand._value <> "PL" Then 'PLN NICHT EU überspringen
+                    Select Case item.Text.ToLower().Trim()
+                        Case "name" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtFirma.Text))
+                        Case "name_adress" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(usrCntl.txtFirma.Text <> "", usrCntl.txtFirma.Text & ", ", "") & IIf(usrCntl.txtAdresse1.Text <> "", usrCntl.txtAdresse1.Text & ", ", "") & usrCntl.cbxLandKz._value & "-" & usrCntl.txtAdresse2.Text & IIf(usrCntl.txtAdresse3.Text <> "", ", " & usrCntl.txtAdresse3.Text, "")))
+                        Case "company" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtFirma.Text))
+                        Case "address" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtAdresse1.Text & " " & IIf(usrCntl.txtAdresse2.Text <> "", ", " & usrCntl.txtAdresse2.Text, "") & " " & usrCntl.txtAdresse3.Text))
+                        Case "lpo" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.cbxLandKz._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text))
+                        Case "pol" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtAdresse2.Text & ", " & usrCntl.txtAdresse3.Text & ", " & usrCntl.cbxLandKz._value))
+                        Case "po" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtAdresse2.Text & ", " & usrCntl.txtAdresse3.Text))
+                        Case "strasse" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtAdresse1.Text))
+                        Case "business" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, "4941 - Transport"))
+                        Case "business1" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, "4941 - Transport"))
+                        Case "zipcode" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtAdresse2.Text))
+                        Case "place_" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtAdresse3.Text))
+                        Case "country" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.cbxLandKz._value))
+                        Case "vatno" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtUid.Text))
+                        Case "vatnr" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtUid.Text))
+                        Case "taxno" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtSteuerNr.Text))
+                        Case "surname_firstname" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_vorname.Text & " " & usrCntl.txt_GF_nachname.Text))
+                        Case "firstname_surname" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_vorname.Text & " " & usrCntl.txt_GF_nachname.Text))

-                Select Case item.Text.ToLower().Trim()
-                    Case "name" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtFirma.Text))
-                    Case "name_adress" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtFirma.Text & " " & usrCntl.txtAdresse1.Text & usrCntl.cbxLandKz._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text))
-                    Case "company" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtFirma.Text))
-                    Case "address" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtAdresse1.Text & " " & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text))
-                    Case "lpo" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.cbxLandKz._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text))
-                    Case "strasse" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtAdresse1.Text))
-                    Case "business" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, "4941 - Transport"))
-                    Case "business1" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, "4941 - Transport"))
-                    Case "zipcode" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtAdresse2.Text))
-                    Case "country" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.cbxLandKz._value))
-                    Case "vatno" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtUid.Text))
-                    Case "vatnr" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtUid.Text))
-                    Case "taxno" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtSteuerNr.Text))
-                    Case "surname_firstname" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_nachname.Text & " " & usrCntl.txt_GF_vorname.Text))
-
-                    Case "ort" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.cbxLandKz._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text)) 'wegen LU PDF
-                    Case "ort_" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtAdresse3.Text)) 'wegen NL PDF
-                    Case "ustnr" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtSteuerNr.Text)) 'wegen LU PDF
+                        Case "ort" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(usrCntl.cboLand._value = "LU", usrCntl.cbxLandKz._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text, ""))) 'wegen LU PDF
+                        Case "ort_" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(usrCntl.cboLand._value = "NL", usrCntl.txtAdresse3.Text, ""))) 'wegen NL PDF
+                        Case "ustnr" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(usrCntl.cboLand._value = "LU", usrCntl.txtSteuerNr.Text, ""))) 'wegen LU PDF


-                    Case "founding_date" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(foundingDateIsValid, usrCntl.txtGruendungsdat.Text, "")))
-                    Case "founding_day" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(foundingDateIsValid, usrCntl.txtGruendungsdat.Text.ToString.Substring(0, 2), "")))
-                    Case "founding_month" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(foundingDateIsValid, usrCntl.txtGruendungsdat.Text.ToString.Substring(3, 2), "")))
-                    Case "founding_year" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(foundingDateIsValid, usrCntl.txtGruendungsdat.Text.ToString.Substring(6, 4), "")))
+                        Case "founding_date" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(foundingDateIsValid, usrCntl.txtGruendungsdat.Text, "")))
+                        Case "founding_day" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(foundingDateIsValid, usrCntl.txtGruendungsdat.Text.ToString.Substring(0, 2), "")))
+                        Case "founding_month" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(foundingDateIsValid, usrCntl.txtGruendungsdat.Text.ToString.Substring(3, 2), "")))
+                        Case "founding_year" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(foundingDateIsValid, usrCntl.txtGruendungsdat.Text.ToString.Substring(6, 4), "")))

                    'NL
-                    Case "private_no" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(usrCntl.cbxPrivatfirma.Checked, "Off", "On")))
-                    Case "private_yes" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(usrCntl.cbxPrivatfirma.Checked, "On", "Off")))
+                        Case "private_no" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(usrCntl.cbxPrivatfirma.Checked, "Off", "On")))
+                        Case "private_yes" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(usrCntl.cbxPrivatfirma.Checked, "On", "Off")))

                    'soll nur bei aktv. Flag "private Firma" angedruckt werden!
-                    Case "ceo_place_prv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(privateFirma, usrCntl.txt_GF_Ort.Text, "")))
-                    Case "ceo_street_prv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(privateFirma, usrCntl.txt_GF_Adresse.Text, "")))
-                    Case "ceo_country_prv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(privateFirma, usrCntl.cbx_GF_Land._value, "")))
-                    Case "ceo_zipcode_prv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(privateFirma, usrCntl.txt_GF_PLZ.Text, "")))
-                    Case "ceo_address_prv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(privateFirma, usrCntl.txt_GF_Adresse.Text & " " & usrCntl.cbx_GF_Land._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text, "")))
-                    Case "ceo_surname_prv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(privateFirma, usrCntl.txt_GF_nachname.Text, "")))
-                    Case "ceo_firstname_prv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(privateFirma, usrCntl.txt_GF_vorname.Text, "")))
-                    Case "ceo_passportvaliduntil_prv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(privateFirma, usrCntl.txt_GF_Passgueltigbis.Text, "")))
-                    Case "ceo_birthdate_prv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(privateFirma, usrCntl.txt_GF_Geb.Text, "")))
-                    Case "ceo_birthplace_prv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(privateFirma, usrCntl.txt_GF_Geburtsort.Text, "")))
-                    Case "ceo_birthcountry_prv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(privateFirma, usrCntl.cbx_GF_Geburtsland.Text, "")))
+                        Case "ceo_place_prv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(privateFirma, usrCntl.txt_GF_Ort.Text, "")))
+                        Case "ceo_street_prv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(privateFirma, usrCntl.txt_GF_Adresse.Text, "")))
+                        Case "ceo_country_prv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(privateFirma, usrCntl.cbx_GF_Land._value, "")))
+                        Case "ceo_zipcode_prv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(privateFirma, usrCntl.txt_GF_PLZ.Text, "")))
+                        Case "ceo_address_prv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(privateFirma, usrCntl.txt_GF_Adresse.Text & " " & usrCntl.cbx_GF_Land._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text, "")))
+                        Case "ceo_surname_prv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(privateFirma, usrCntl.txt_GF_nachname.Text, "")))
+                        Case "ceo_firstname_prv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(privateFirma, usrCntl.txt_GF_vorname.Text, "")))
+                        Case "ceo_passportvaliduntil_prv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(privateFirma, usrCntl.txt_GF_Passgueltigbis.Text, "")))
+                        Case "ceo_birthdate_prv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(privateFirma, usrCntl.txt_GF_Geb.Text, "")))
+                        Case "ceo_birthplace_prv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(privateFirma, usrCntl.txt_GF_Geburtsort.Text, "")))
+                        Case "ceo_birthcountry_prv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(privateFirma, usrCntl.cbx_GF_Geburtsland.Text, "")))

                    'soll nur bei deaktv. Flag "private Firma" angedruckt werden!
-                    Case "name_nprv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(Not privateFirma, usrCntl.txtFirma.Text, "")))
-                    Case "company_nprv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(Not privateFirma, usrCntl.txtFirma.Text, "")))
-                    Case "strasse_nprv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(Not privateFirma, usrCntl.txtAdresse1.Text, "")))
-                    Case "founding_date_nprv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(foundingDateIsValid AndAlso Not privateFirma, usrCntl.txtGruendungsdat.Text, "")))
-                    Case "ort_nprv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(Not privateFirma, usrCntl.txtAdresse3.Text & usrCntl.cbxLandKz._value, "")))
+                        Case "name_nprv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(Not privateFirma, usrCntl.txtFirma.Text, "")))
+                        Case "strasse_nprv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(Not privateFirma, usrCntl.txtAdresse1.Text, "")))
+                        Case "company_nprv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(Not privateFirma, usrCntl.txtFirma.Text, "")))
+                        Case "firma_nprv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(Not privateFirma, "DOO", "")))
+                        Case "founding_date_nprv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(foundingDateIsValid AndAlso Not privateFirma, usrCntl.txtGruendungsdat.Text, "")))
+                        Case "ort_nprv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(Not privateFirma, usrCntl.txtAdresse3.Text & " " & usrCntl.cbxLandKz._value, "")))



-                    Case "ceo_birthdate" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_Geb.Text))
-                    Case "ceo" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_nachname.Text & " " & usrCntl.txt_GF_vorname.Text))
-                    Case "ceo_address" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_Adresse.Text & " " & usrCntl.cbx_GF_Land._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text))
-                    Case "ceo_birthplace" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_Geburtsort.Text))
-                    Case "ceo_birthcountry" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.cbx_GF_Geburtsland.Text))
-                    Case "ceo_passportvaliduntil" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_Passgueltigbis.Text))
-                    Case "function" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(usrCntl.txt_GF_nachname.Text <> "", "CEO", "")))
-                    Case "ceo_surname" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_nachname.Text))
-                    Case "ceo_firstname" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_vorname.Text))
+                        Case "ceo_birthdate" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_Geb.Text))
+                        Case "ceo" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_nachname.Text & usrCntl.txt_GF_vorname.Text))
+                        Case "ceo_address" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(usrCntl.txt_GF_Adresse.Text <> "", usrCntl.txt_GF_Adresse.Text & ", ", "") & usrCntl.cbx_GF_Land._value & "-" & usrCntl.txt_GF_PLZ.Text & IIf(usrCntl.txt_GF_Ort.Text <> "", ", " & usrCntl.txt_GF_Ort.Text, "")))
+                        Case "ceo_birthplace" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_Geburtsort.Text))
+                        Case "ceo_birthcountry" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.cbx_GF_Geburtsland.Text))
+                        Case "ceo_passportvaliduntil" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_Passgueltigbis.Text))
+                        Case "function" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(usrCntl.txt_GF_nachname.Text <> "", functionCEO, "")))
+                        Case "ceo_surname" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_nachname.Text))
+                        Case "ceo_firstname" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_vorname.Text))

-                    Case "place" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtOrt.Text))
-                    'Case "place_date" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtOrt.Text & " " & IIf(IsDate(usrCntl.datDatum.Text), usrCntl.datDatum.Text, ""))) ->  soll nicht gesetzt werden
-                    Case "capital" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtKapital.Text & " " & usrCntl.cbxKapitalWahrung._value))
-                    Case "crnumber" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtHRNr.Text))
+                        Case "place_date" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtOrt.Text & IIf(IsDate(usrCntl.datDatum.Text) AndAlso usrCntl.cbxPrintDate.Checked, usrCntl.datDatum.Text, "")))
+                        Case "place" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtOrt.Text))
+                        Case "date" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(IsDate(usrCntl.datDatum.Text) AndAlso usrCntl.cbxPrintDate.Checked, usrCntl.datDatum.Text, "")))
+                        Case "capital" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtKapital.Text & " " & usrCntl.cbxKapitalWahrung._value))
+                        Case "crnumber" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtHRNr.Text))

-                    Case "c_name" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, FIRMA.Firma_Bez))
-                    Case "c_address" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, FIRMA.Firma_Straße & " " & FIRMA.Firma_Ort))
-                    Case "c_name_adress" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, FIRMA.Firma_Bez & ", " & FIRMA.Firma_Straße & ", " & FIRMA.Firma_Ort))
-                    Case "c_name_adress1" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, FIRMA.Firma_Bez & ", " & FIRMA.Firma_Straße & ", " & FIRMA.Firma_Ort))
-                    Case "c_street" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, FIRMA.Firma_Straße))
-                    Case "c_zipcode" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, FIRMA.Firma_Ort))
-                    Case "c_vatno" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, FIRMA.Firma_UID))
-                    Case "c_phone" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, FIRMA.Firma_Telefon))
-                    Case "c_fax" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, FIRMA.Firma_Telefax))
-                    Case "c_mailcontact" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtEmailzurueck.Text))
-                    Case "c_bank" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, FIRMA.Firma_Bankverbindung1))
-                    Case "c_iban" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, FIRMA.Firma_IBAN1.Replace("IBAN:", "")))
-                    Case "c_bic" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, FIRMA.Firma_BIC1.Replace("BIC:", "")))
-                    Case "c_kontonr" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, FIRMA.Firma_IBAN1.Replace("IBAN:", "").Replace(" ", "").ToString.Trim().Substring(13, 7)))
-                    Case "c_blz" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, FIRMA.Firma_IBAN1.Replace("IBAN:", "").Replace(" ", "").ToString.Trim().Substring(3, 5)))
+                        Case "c_name" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, FIRMA.Firma_Bez))
+                        Case "c_address" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, FIRMA.Firma_Straße & " " & FIRMA.Firma_Ort))
+                        Case "c_name_adress" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, FIRMA.Firma_Bez & ", " & FIRMA.Firma_Straße & ", " & FIRMA.Firma_Ort))
+                        Case "c_name_adress1" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, FIRMA.Firma_Bez & ", " & FIRMA.Firma_Straße & ", " & FIRMA.Firma_Ort))
+                        Case "c_street" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, FIRMA.Firma_Straße))
+                        Case "c_zipcode" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, FIRMA.Firma_Ort))
+                        Case "c_vatno" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, FIRMA.Firma_UID))
+                        Case "c_phone" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, FIRMA.Firma_Telefon))
+                        Case "c_fax" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, FIRMA.Firma_Telefax))
+                        Case "c_mailcontact" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtEmailzurueck.Text))
+                        Case "c_bank" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, FIRMA.Firma_Bankverbindung1))
+                        Case "c_iban" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, FIRMA.Firma_IBAN1.Replace("IBAN:", "")))
+                        Case "c_bic" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, FIRMA.Firma_BIC1.Replace("BIC:", "")))
+                        Case "c_kontonr" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, FIRMA.Firma_IBAN1.Replace("IBAN:", "").Replace(" ", "").ToString.Trim().Substring(13, 7)))
+                        Case "c_blz" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, FIRMA.Firma_IBAN1.Replace("IBAN:", "").Replace(" ", "").ToString.Trim().Substring(3, 5)))
+
+                        Case "date_day" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(usrCntl.cbxPrintDate.Checked AndAlso IsDate(usrCntl.datDatum.Text), usrCntl.datDatum.Text.ToString.Substring(0, 2), "")))
+                        Case "date_month" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(usrCntl.cbxPrintDate.Checked AndAlso IsDate(usrCntl.datDatum.Text), usrCntl.datDatum.Text.ToString.Substring(3, 2), "")))
+                        Case "date_year" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(usrCntl.cbxPrintDate.Checked AndAlso IsDate(usrCntl.datDatum.Text), usrCntl.datDatum.Text.ToString.Substring(6, 4), "")))



-                End Select
+                    End Select
+
+                Else
+
+                    Select Case item.Text.ToLower().Trim()
+                        Case "Tagesdatum" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(IsDate(usrCntl.datDatum.Text) AndAlso usrCntl.cbxPrintDate.Checked, usrCntl.datDatum.Text, "")))
+                    End Select
+
+                End If

-                'surname_firstname
-                'surname
-                'lastname
-                'place_date
-                'vat_country
-                'place
-                'c_mailcontact

            Next

+
+
            striList.Add(fm.fillPDF_Editierbar("DOKUMENTE", "VORLAGEN", "VOLLMACHTEN", "MDM", "", "VM_NICHTEU_" & usrCntl.cboLand._value, listItem2, listTowrite,,,,,, False))

            'aktuell WORD und PDF
@@ -1837,32 +1852,51 @@ Public Class FormularManagerNEU

                    Select Case fieldName.ToString.ToLower
                        Case "name" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtFirma.Text
-                        Case "name_1" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtFirma.Text
-                        Case "name_2" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtFirma.Text
+                        Case "name1" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtFirma.Text
+                        Case "name2" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtFirma.Text
+                        Case "name3" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtFirma.Text
+                        Case "name4" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtFirma.Text
+                        Case "name5" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtFirma.Text
+
                        Case "address" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse1.Text & " " & usrCntl.cbxLandKz._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text
+
                        Case "zipcode" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse2.Text
+                        Case "zipcode1" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse2.Text
+
                        Case "lpo" : odoc.FormFields(fieldName).Range.Text = usrCntl.cbxLandKz._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text
+
                        Case "country" : odoc.FormFields(fieldName).Range.Text = usrCntl.cbxLandKz._value
+                        Case "country1" : odoc.FormFields(fieldName).Range.Text = usrCntl.cbxLandKz._value
+
                        Case "place" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse3.Text
+                        Case "place1" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse3.Text
+
                        Case "street" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse1.Text
+                        Case "street1" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse1.Text
                        Case "strasse" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse1.Text
-                        Case "surname_firstname" : odoc.FormFields(fieldName).Range.Text = IIf(usrCntl.txt_GF_nachname.Text <> "", usrCntl.txt_GF_nachname.Text, "") & " " & IIf(usrCntl.txt_GF_vorname.Text <> "", usrCntl.txt_GF_vorname.Text, "")
+                        Case "surname_firstname" : odoc.FormFields(fieldName).Range.Text = IIf(usrCntl.txt_GF_vorname.Text <> "", usrCntl.txt_GF_vorname.Text & " ", " ") & IIf(usrCntl.txt_GF_nachname.Text <> "", usrCntl.txt_GF_nachname.Text, "")
+                        Case "firstname_surname" : odoc.FormFields(fieldName).Range.Text = IIf(usrCntl.txt_GF_vorname.Text <> "", usrCntl.txt_GF_vorname.Text & " ", " ") & IIf(usrCntl.txt_GF_nachname.Text <> "", usrCntl.txt_GF_nachname.Text, "")
+                        Case "capital" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtKapital.Text & " " & usrCntl.cbxKapitalWahrung._value
+                        Case "crnumber" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtHRNr.Text
+                        Case "vatno" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtUid.Text
+                        Case "mailcontact" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtEmail.Text
+                        Case "phone" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtTel.Text
+
+                        Case "taxno" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtSteuerNr.Text
+                        Case "taxno1" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtSteuerNr.Text
+
+                        Case "function" : odoc.FormFields(fieldName).Range.Text = IIf(usrCntl.txt_GF_nachname.Text <> "", functionCEO, "")

                        Case "ceo_place" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_Ort.Text
                        Case "ceo_country" : odoc.FormFields(fieldName).Range.Text = usrCntl.cbx_GF_Land._value
                        Case "ceo_zipcode" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_PLZ.Text
                        Case "ceo_birthdate" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_Geb.Text
                        Case "ceo_street" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_Adresse.Text
-                        Case "ceo_address" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_Adresse.Text & " " & usrCntl.cbx_GF_Land._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text
+                        Case "ceo_address" : odoc.FormFields(fieldName).Range.Text = IIf(usrCntl.txt_GF_Adresse.Text <> "", usrCntl.txt_GF_Adresse.Text & " ,", "") & usrCntl.cbx_GF_Land._value & "-" & usrCntl.txt_GF_PLZ.Text & " " & IIf(usrCntl.txt_GF_Ort.Text <> "", ", " & usrCntl.txt_GF_Ort.Text, "")
                        Case "ceo_birthplace" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_Geburtsort.Text
                        Case "ceo_birthcountry" : odoc.FormFields(fieldName).Range.Text = usrCntl.cbx_GF_Geburtsland._value
                        Case "ceo_passportvaliduntil" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_Passgueltigbis.Text

-                        Case "vatno" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtUid.Text
-                        Case "mailcontact" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtEmail.Text ' TODO: neues Feld im formular
-                        Case "phone" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtEmail.Text ' TODO: neues Feld im formular
-                        Case "taxno" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtSteuerNr.Text
-                        Case "function" : odoc.FormFields(fieldName).Range.Text = IIf(usrCntl.txt_GF_nachname.Text <> "", "CEO", "")
                        Case "c_name" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
                        Case "c_name1" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
                        Case "c_name2" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
@@ -1871,30 +1905,36 @@ Public Class FormularManagerNEU
                        Case "c_name5" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
                        Case "c_name6" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
                        Case "c_name7" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
+
                        Case "c_address" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Straße & " " & FIRMA.Firma_Ort
+                        Case "c_address1" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Straße & " " & FIRMA.Firma_Ort
+                        Case "c_address2" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Straße & " " & FIRMA.Firma_Ort
+                        Case "c_address3" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Straße & " " & FIRMA.Firma_Ort
+
                        Case "c_street" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Straße
+                        Case "c_street1" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Straße
+
                        Case "c_zipcode" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Ort
+                        Case "c_zipcode1" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Ort
+
                        Case "c_vatno" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_UID
+                        Case "c_vatno1" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_UID
+
                        Case "c_phone" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Telefon & " " & FIRMA.Firma_Telefax
+                        Case "c_phone1" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Telefon & " " & FIRMA.Firma_Telefax
+
                        Case "c_mailcontact" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtEmailzurueck.Text
                        Case "c_bank" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bankverbindung1
-                        Case "c_iban" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_IBAN1.Replace("IBAN:", "")
-                        Case "c_bic" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_BIC1.Replace("BIC:", "")
-                        Case "place_date" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtOrt.Text & ", " & IIf(IsDate(usrCntl.datDatum.Text), usrCntl.datDatum.Text, "")
-                        Case "capital" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtKapital.Text & " " & usrCntl.cbxKapitalWahrung._value
-                        Case "crnumber" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtHRNr.Text

-                            'Case "company" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtFirma.Text))
-                            'Case "address" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtAdresse1.Text & " " & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text))
-                            'Case "zipcode" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtAdresse2.Text))
-                            'Case "country" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.cbxLandKz.Text))
-                            'Case "vatno" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtUid.Text))
-                            'Case "vatnr" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtUid.Text))
-                            'Case "surname_firstname" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtHerrFrau.Text))
-                            'Case "surname" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtHerrFrau.Text))
-                            'Case "firstname" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtHerrFrau.Text))
-                            'Case "place" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtOrt.Text))
-                            'Case "place_date" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtOrt.Text & " " & usrCntl.datDatum.ToString("ddMMyyyy")))
+                        Case "c_iban" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_IBAN1.Replace("IBAN:", "")
+                        Case "c_iban1" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_IBAN1.Replace("IBAN:", "")
+
+                        Case "c_bic" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_BIC1.Replace("BIC:", "")
+                        Case "c_bic1" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_BIC1.Replace("BIC:", "")
+
+                        Case "c_place_date" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtOrt.Text & ", " & IIf(IsDate(usrCntl.datDatum.Text) AndAlso usrCntl.cbxPrintDate.Checked, usrCntl.datDatum.Text, "")
+                        Case "c_date" : odoc.FormFields(fieldName).Range.Text = IIf(IsDate(usrCntl.datDatum.Text) AndAlso usrCntl.cbxPrintDate.Checked, usrCntl.datDatum.Text, "")
+                        Case "c_place" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtOrt.Text

                    End Select

@@ -1991,7 +2031,14 @@ Public Class FormularManagerNEU
                    Case "country" : odoc.FormFields(fieldName).Range.Text = usrCntl.cbxLandKz._value
                    Case "place" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse3.Text
                    Case "street" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse1.Text
-                    Case "surname_firstname" : odoc.FormFields(fieldName).Range.Text = IIf(usrCntl.txt_GF_Name.Text <> "", usrCntl.txt_GF_Name.Text, usrCntl.txtHerrFrau.Text)
+                    Case "surname_firstname" : odoc.FormFields(fieldName).Range.Text = IIf(usrCntl.txt_GF_nachname.Text <> "", usrCntl.txt_GF_nachname.Text & " ", " ") & IIf(usrCntl.txt_GF_vorname.Text <> "", usrCntl.txt_GF_vorname.Text, "")
+                    Case "firstname_surname" : odoc.FormFields(fieldName).Range.Text = IIf(usrCntl.txt_GF_vorname.Text <> "", usrCntl.txt_GF_vorname.Text & " ", " ") & IIf(usrCntl.txt_GF_nachname.Text <> "", usrCntl.txt_GF_nachname.Text, "")
+                    Case "vatno" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtUid.Text
+                    Case "mailcontact" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtEmail.Text
+                    Case "phone" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtEmail.Text
+                    Case "taxno" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtSteuerNr.Text
+                    Case "capital" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtKapital.Text & " " & usrCntl.cbxKapitalWahrung._value
+                    Case "crnumber" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtHRNr.Text

                    Case "ceo_place" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_Ort.Text
                    Case "ceo_country" : odoc.FormFields(fieldName).Range.Text = usrCntl.cbx_GF_Land._value
@@ -2003,11 +2050,6 @@ Public Class FormularManagerNEU
                    Case "ceo_birthcountry" : odoc.FormFields(fieldName).Range.Text = usrCntl.cbx_GF_Geburtsland._value
                    Case "ceo_passportvaliduntil" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_Passgueltigbis.Text

-
-                    Case "vatno" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtUid.Text
-                    Case "mailcontact" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtEmail.Text ' TODO: neues Feld im formular
-                    Case "phone" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtEmail.Text ' TODO: neues Feld im formular
-                    Case "taxno" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtSteuerNr.Text
                    Case "c_name" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
                    Case "c_name1" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
                    Case "c_name2" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
@@ -2026,20 +2068,6 @@ Public Class FormularManagerNEU
                    Case "c_iban" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_IBAN1.Replace("IBAN:", "")
                    Case "c_bic" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_BIC1.Replace("BIC:", "")
                    Case "place_date" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtOrt.Text & ", " & IIf(IsDate(usrCntl.datDatum.Text), usrCntl.datDatum.Text, "")
-                    Case "capital" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtKapital.Text & " " & usrCntl.cbxKapitalWahrung._value
-                    Case "crnumber" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtHRNr.Text
-
-                        'Case "company" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtFirma.Text))
-                        'Case "address" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtAdresse1.Text & " " & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text))
-                        'Case "zipcode" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtAdresse2.Text))
-                        'Case "country" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.cbxLandKz.Text))
-                        'Case "vatno" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtUid.Text))
-                        'Case "vatnr" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtUid.Text))
-                        'Case "surname_firstname" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtHerrFrau.Text))
-                        'Case "surname" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtHerrFrau.Text))
-                        'Case "firstname" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtHerrFrau.Text))
-                        'Case "place" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtOrt.Text))
-                        'Case "place_date" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtOrt.Text & " " & usrCntl.datDatum.ToString("ddMMyyyy")))

                End Select