MDM, CHAT, MSE_API

SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_EU.Designer.vb

@@ -54,7 +54,6 @@ Partial Class usrcntlVollmacht_MDM_EU
         Me.txt_GF_PLZ = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txt_GF_Adresse = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txt_GF_Geb = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.txt_GF_Name = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtEmailzurueck = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtHerrFrau = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtAdresse3 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -83,6 +82,8 @@ Partial Class usrcntlVollmacht_MDM_EU
         Me.cbx_GF_Geburtsland = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Label21 = New System.Windows.Forms.Label()
         Me.CheckedListBox1 = New System.Windows.Forms.CheckedListBox()
+        Me.txt_GF_nachname = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txt_GF_vorname = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
@@ -453,9 +454,9 @@ Partial Class usrcntlVollmacht_MDM_EU
         Me.txt_GF_Adresse._DateTimeOnly = False
         Me.txt_GF_Adresse._numbersOnly = False
         Me.txt_GF_Adresse._numbersOnlyKommastellen = ""
-        Me.txt_GF_Adresse._numbersOnlyTrennzeichen = True
+        Me.txt_GF_Adresse._numbersOnlyTrennzeichen = False
         Me.txt_GF_Adresse._Prozent = False
-        Me.txt_GF_Adresse._ShortDateNew = True
+        Me.txt_GF_Adresse._ShortDateNew = False
         Me.txt_GF_Adresse._ShortDateOnly = False
         Me.txt_GF_Adresse._TimeOnly = False
         Me.txt_GF_Adresse._TimeOnly_Seconds = False
@@ -496,29 +497,6 @@ Partial Class usrcntlVollmacht_MDM_EU
         Me.txt_GF_Geb.Size = New System.Drawing.Size(310, 20)
         Me.txt_GF_Geb.TabIndex = 78
         '
-        'txt_GF_Name
-        '
-        Me.txt_GF_Name._DateTimeOnly = False
-        Me.txt_GF_Name._numbersOnly = False
-        Me.txt_GF_Name._numbersOnlyKommastellen = ""
-        Me.txt_GF_Name._numbersOnlyTrennzeichen = True
-        Me.txt_GF_Name._Prozent = False
-        Me.txt_GF_Name._ShortDateNew = False
-        Me.txt_GF_Name._ShortDateOnly = False
-        Me.txt_GF_Name._TimeOnly = False
-        Me.txt_GF_Name._TimeOnly_Seconds = False
-        Me.txt_GF_Name._value = Nothing
-        Me.txt_GF_Name._Waehrung = False
-        Me.txt_GF_Name._WaehrungZeichen = True
-        Me.txt_GF_Name.ForeColor = System.Drawing.Color.Black
-        Me.txt_GF_Name.Location = New System.Drawing.Point(254, 236)
-        Me.txt_GF_Name.MaxLineLength = -1
-        Me.txt_GF_Name.MaxLines_Warning = ""
-        Me.txt_GF_Name.MaxLines_Warning_Label = Nothing
-        Me.txt_GF_Name.Name = "txt_GF_Name"
-        Me.txt_GF_Name.Size = New System.Drawing.Size(310, 20)
-        Me.txt_GF_Name.TabIndex = 76
-        '
         'txtEmailzurueck
         '
         Me.txtEmailzurueck._DateTimeOnly = False
@@ -1009,6 +987,52 @@ Partial Class usrcntlVollmacht_MDM_EU
         Me.CheckedListBox1.TabIndex = 113
         Me.CheckedListBox1.Visible = False
         '
+        'txt_GF_nachname
+        '
+        Me.txt_GF_nachname._DateTimeOnly = False
+        Me.txt_GF_nachname._numbersOnly = False
+        Me.txt_GF_nachname._numbersOnlyKommastellen = ""
+        Me.txt_GF_nachname._numbersOnlyTrennzeichen = True
+        Me.txt_GF_nachname._Prozent = False
+        Me.txt_GF_nachname._ShortDateNew = False
+        Me.txt_GF_nachname._ShortDateOnly = False
+        Me.txt_GF_nachname._TimeOnly = False
+        Me.txt_GF_nachname._TimeOnly_Seconds = False
+        Me.txt_GF_nachname._value = Nothing
+        Me.txt_GF_nachname._Waehrung = False
+        Me.txt_GF_nachname._WaehrungZeichen = True
+        Me.txt_GF_nachname.ForeColor = System.Drawing.Color.Black
+        Me.txt_GF_nachname.Location = New System.Drawing.Point(254, 236)
+        Me.txt_GF_nachname.MaxLineLength = -1
+        Me.txt_GF_nachname.MaxLines_Warning = ""
+        Me.txt_GF_nachname.MaxLines_Warning_Label = Nothing
+        Me.txt_GF_nachname.Name = "txt_GF_nachname"
+        Me.txt_GF_nachname.Size = New System.Drawing.Size(142, 20)
+        Me.txt_GF_nachname.TabIndex = 145
+        '
+        'txt_GF_vorname
+        '
+        Me.txt_GF_vorname._DateTimeOnly = False
+        Me.txt_GF_vorname._numbersOnly = False
+        Me.txt_GF_vorname._numbersOnlyKommastellen = ""
+        Me.txt_GF_vorname._numbersOnlyTrennzeichen = True
+        Me.txt_GF_vorname._Prozent = False
+        Me.txt_GF_vorname._ShortDateNew = False
+        Me.txt_GF_vorname._ShortDateOnly = False
+        Me.txt_GF_vorname._TimeOnly = False
+        Me.txt_GF_vorname._TimeOnly_Seconds = False
+        Me.txt_GF_vorname._value = Nothing
+        Me.txt_GF_vorname._Waehrung = False
+        Me.txt_GF_vorname._WaehrungZeichen = True
+        Me.txt_GF_vorname.ForeColor = System.Drawing.Color.Black
+        Me.txt_GF_vorname.Location = New System.Drawing.Point(402, 236)
+        Me.txt_GF_vorname.MaxLineLength = -1
+        Me.txt_GF_vorname.MaxLines_Warning = ""
+        Me.txt_GF_vorname.MaxLines_Warning_Label = Nothing
+        Me.txt_GF_vorname.Name = "txt_GF_vorname"
+        Me.txt_GF_vorname.Size = New System.Drawing.Size(163, 20)
+        Me.txt_GF_vorname.TabIndex = 146
+        '
         'usrcntlVollmacht_MDM_EU
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1048,7 +1072,6 @@ Partial Class usrcntlVollmacht_MDM_EU
         Me.Controls.Add(Me.Label10)
         Me.Controls.Add(Me.txt_GF_Geb)
         Me.Controls.Add(Me.lblGFGebDat)
-        Me.Controls.Add(Me.txt_GF_Name)
         Me.Controls.Add(Me.Label12)
         Me.Controls.Add(Me.txtEmailzurueck)
         Me.Controls.Add(Me.Label14)
@@ -1076,6 +1099,8 @@ Partial Class usrcntlVollmacht_MDM_EU
         Me.Controls.Add(Me.Label1)
         Me.Controls.Add(Me.txtFirma)
         Me.Controls.Add(Me.lbl)
+        Me.Controls.Add(Me.txt_GF_nachname)
+        Me.Controls.Add(Me.txt_GF_vorname)
         Me.Name = "usrcntlVollmacht_MDM_EU"
         Me.Size = New System.Drawing.Size(1143, 368)
         CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1118,7 +1143,6 @@ Partial Class usrcntlVollmacht_MDM_EU
     Friend WithEvents Label10 As Label
     Friend WithEvents txt_GF_Geb As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents lblGFGebDat As Label
-    Friend WithEvents txt_GF_Name As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents Label12 As Label
     Friend WithEvents txtFax As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents txtSteuerNr As VERAG_PROG_ALLGEMEIN.MyTextBox
@@ -1144,4 +1168,6 @@ Partial Class usrcntlVollmacht_MDM_EU
     Friend WithEvents cbx_GF_Geburtsland As VERAG_PROG_ALLGEMEIN.MyComboBox
     Friend WithEvents Label21 As Label
     Friend WithEvents CheckedListBox1 As CheckedListBox
+    Friend WithEvents txt_GF_nachname As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents txt_GF_vorname As VERAG_PROG_ALLGEMEIN.MyTextBox
 End Class

SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_EU.vb

@@ -54,7 +54,8 @@ Public Class usrcntlVollmacht_MDM_EU
 
         Dim GF As cKundenKontakte = KK_List.LIST.Find(Function(c) c.kkd_kkaId = 13 And c.kkd_KundenNr = KdNR)
         If GF IsNot Nothing Then
-            txt_GF_Name.Text = GF.kkd_AnsprechpartnerAnrede & IIf(GF.kkd_AnsprechpartnerNachname <> "", GF.kkd_AnsprechpartnerNachname & " ", "") & IIf(GF.kkd_AnsprechpartnerVorname <> "", GF.kkd_AnsprechpartnerVorname & " ", "")
+            txt_GF_nachname.Text = IIf(GF.kkd_AnsprechpartnerNachname <> "", GF.kkd_AnsprechpartnerNachname & " ", "")
+            txt_GF_vorname.Text = IIf(GF.kkd_AnsprechpartnerVorname <> "", GF.kkd_AnsprechpartnerVorname & " ", "")
 
             If (GF.kkd_GebDatum IsNot Nothing AndAlso IsDate(GF.kkd_GebDatum)) Then
                 txt_GF_Geb.Text = CDate(GF.kkd_GebDatum).ToShortDateString
@@ -71,7 +72,8 @@ Public Class usrcntlVollmacht_MDM_EU
             txt_GF_Geburtsort.Text = If(GF.kkd_Geburtsort, "")
             cbx_GF_Geburtsland.changeItem(GF.kkd_Geburtsland)
         Else
-            txt_GF_Name.Text = ""
+            txt_GF_nachname.Text = ""
+            txt_GF_vorname.Text = ""
             txt_GF_Geb.Text = ""
             txt_GF_Adresse.Text = ""
             txt_GF_Ort.Text = ""
@@ -137,13 +139,15 @@ Public Class usrcntlVollmacht_MDM_EU
         cboLand.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Slovenia", "SI"))
         cboLand.changeItem("")
 
-        CheckedListBox1.Items.AddRange(cboLand.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray())
-
         cbxLandKz.fillWithSQL("select distinct landkz, Währungstabelle.Land  from   Währungstabelle  where landkz is not null  order by LandKz", , "FMZOLL", True)
 
+        cbxKapitalWahrung.fillWithSQL("SELECT [Währungscode],[Land] FROM Währungstabelle ORDER BY Währungscode",  , "FMZOLL", False)
+
+        cbx_GF_Land.Items.Clear()
         cbx_GF_Land.Items.AddRange(cbxLandKz.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray())
 
-        cbxKapitalWahrung.fillWithSQL("SELECT [Währungscode],[Land] FROM Währungstabelle ORDER BY Währungscode",  , "FMZOLL", False)
+        cbx_GF_Geburtsland.Items.Clear()
+        cbx_GF_Geburtsland.Items.AddRange(cbxLandKz.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray())
 
         txtEmailzurueck.Text = "juricevic@verag.ag"
         txtOrt.Text = "Suben"

SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_NICHT_EU.Designer.vb

@@ -82,6 +82,7 @@ Partial Class usrcntlVollmacht_MDM_NICHT_EU
         Me.Label19 = New System.Windows.Forms.Label()
         Me.cbxPrivatfirma = New System.Windows.Forms.CheckBox()
         Me.txt_GF_vorname = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.cbxPrintDate = New System.Windows.Forms.CheckBox()
         CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
@@ -443,9 +444,9 @@ Partial Class usrcntlVollmacht_MDM_NICHT_EU
         Me.txt_GF_Adresse._DateTimeOnly = False
         Me.txt_GF_Adresse._numbersOnly = False
         Me.txt_GF_Adresse._numbersOnlyKommastellen = ""
-        Me.txt_GF_Adresse._numbersOnlyTrennzeichen = True
+        Me.txt_GF_Adresse._numbersOnlyTrennzeichen = False
         Me.txt_GF_Adresse._Prozent = False
-        Me.txt_GF_Adresse._ShortDateNew = True
+        Me.txt_GF_Adresse._ShortDateNew = False
         Me.txt_GF_Adresse._ShortDateOnly = False
         Me.txt_GF_Adresse._TimeOnly = False
         Me.txt_GF_Adresse._TimeOnly_Seconds = False
@@ -917,7 +918,7 @@ Partial Class usrcntlVollmacht_MDM_NICHT_EU
         Me.txt_GF_Geburtsort._WaehrungZeichen = False
         Me.txt_GF_Geburtsort.ForeColor = System.Drawing.Color.Black
         Me.txt_GF_Geburtsort.Location = New System.Drawing.Point(253, 278)
-        Me.txt_GF_Geburtsort.MaxLength = 10
+        Me.txt_GF_Geburtsort.MaxLength = 50
         Me.txt_GF_Geburtsort.MaxLineLength = -1
         Me.txt_GF_Geburtsort.MaxLines_Warning = ""
         Me.txt_GF_Geburtsort.MaxLines_Warning_Label = Nothing
@@ -1001,12 +1002,24 @@ Partial Class usrcntlVollmacht_MDM_NICHT_EU
         Me.txt_GF_vorname.Size = New System.Drawing.Size(163, 20)
         Me.txt_GF_vorname.TabIndex = 144
         '
+        'cbxPrintDate
+        '
+        Me.cbxPrintDate.AutoSize = True
+        Me.cbxPrintDate.Checked = True
+        Me.cbxPrintDate.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxPrintDate.Location = New System.Drawing.Point(969, 312)
+        Me.cbxPrintDate.Name = "cbxPrintDate"
+        Me.cbxPrintDate.Size = New System.Drawing.Size(15, 14)
+        Me.cbxPrintDate.TabIndex = 145
+        Me.cbxPrintDate.UseVisualStyleBackColor = True
+        '
         'usrcntlVollmacht_MDM_NICHT_EU
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.BackColor = System.Drawing.Color.WhiteSmoke
         Me.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Controls.Add(Me.cbxPrintDate)
         Me.Controls.Add(Me.cbxPrivatfirma)
         Me.Controls.Add(Me.cbx_GF_Geburtsland)
         Me.Controls.Add(Me.Label21)
@@ -1134,4 +1147,5 @@ Partial Class usrcntlVollmacht_MDM_NICHT_EU
     Friend WithEvents Label19 As Label
     Friend WithEvents cbxPrivatfirma As CheckBox
     Friend WithEvents txt_GF_vorname As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents cbxPrintDate As CheckBox
 End Class

SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_NICHT_EU.vb

@@ -127,10 +127,8 @@ Public Class usrcntlVollmacht_MDM_NICHT_EU
         cboLand.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Hungary", "HU"))
         cboLand.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Ireland", "IE"))
         cboLand.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Italy", "IT"))
-        'cboLand.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Lithuania", "LT"))
         cboLand.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Luxenbourg", "LU"))
         cboLand.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Netherlands", "NL"))
-        'cboLand.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Norway", "NO"))
         cboLand.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Poland", "PL"))
         cboLand.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Romania", "RO"))
         cboLand.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Sweden", "SE"))
@@ -140,6 +138,8 @@ Public Class usrcntlVollmacht_MDM_NICHT_EU
 
         cbxLandKz.fillWithSQL("select distinct landkz, Währungstabelle.Land  from   Währungstabelle  where landkz is not null  order by LandKz", , "FMZOLL", True)
 
+        cbxKapitalWahrung.fillWithSQL("SELECT [Währungscode],[Land] FROM Währungstabelle ORDER BY Währungscode",  , "FMZOLL", False)
+
         cbx_GF_Land.Items.Clear()
         cbx_GF_Land.Items.AddRange(cbxLandKz.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray())
 

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 "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 "name" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtFirma.Text))
+                        Case "ort_" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(usrCntl.cboLand._value = "NL", usrCntl.txtAdresse3.Text, ""))) 'wegen NL PDF
-                    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 "ustnr" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(usrCntl.cboLand._value = "LU", usrCntl.txtSteuerNr.Text, ""))) 'wegen LU PDF
-                    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 "founding_date" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(foundingDateIsValid, usrCntl.txtGruendungsdat.Text, "")))
+                        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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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 "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 "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 "founding_date_nprv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(foundingDateIsValid AndAlso Not privateFirma, usrCntl.txtGruendungsdat.Text, "")))
+                        Case "firma_nprv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(Not privateFirma, "DOO", "")))
-                    Case "ort_nprv" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(Not privateFirma, usrCntl.txtAdresse3.Text & usrCntl.cbxLandKz._value, "")))
+                        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_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" : 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_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_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_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 "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 "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_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_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) AndAlso usrCntl.cbxPrintDate.Checked, usrCntl.datDatum.Text, "")))
-                    'Case "place_date" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtOrt.Text & " " & IIf(IsDate(usrCntl.datDatum.Text), usrCntl.datDatum.Text, ""))) ->  soll nicht gesetzt werden
+                        Case "place" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtOrt.Text))
-                    Case "capital" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtKapital.Text & " " & usrCntl.cbxKapitalWahrung._value))
+                        Case "date" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(IsDate(usrCntl.datDatum.Text) AndAlso usrCntl.cbxPrintDate.Checked, usrCntl.datDatum.Text, "")))
-                    Case "crnumber" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtHRNr.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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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 "name1" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtFirma.Text
-                        Case "name_2" : 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 "c_iban" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_IBAN1.Replace("IBAN:", "")
-                            'Case "address" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtAdresse1.Text & " " & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text))
+                        Case "c_iban1" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_IBAN1.Replace("IBAN:", "")
-                            '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 "c_bic" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_BIC1.Replace("BIC:", "")
-                            'Case "vatno" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtUid.Text))
+                        Case "c_bic1" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_BIC1.Replace("BIC:", "")
-                            '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 "c_place_date" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtOrt.Text & ", " & IIf(IsDate(usrCntl.datDatum.Text) AndAlso usrCntl.cbxPrintDate.Checked, usrCntl.datDatum.Text, "")
-                            'Case "surname" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtHerrFrau.Text))
+                        Case "c_date" : odoc.FormFields(fieldName).Range.Text = IIf(IsDate(usrCntl.datDatum.Text) AndAlso usrCntl.cbxPrintDate.Checked, usrCntl.datDatum.Text, "")
-                            'Case "firstname" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtHerrFrau.Text))
+                        Case "c_place" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtOrt.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
 
@@ -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
 

SDL/kunden/usrCntlOfferte.Designer.vb

@@ -23,8 +23,8 @@ Partial Class usrCntlOfferte
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
-        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.lblBesonderheiten = New System.Windows.Forms.Label()
         Me.rtbBesonderheiten = New System.Windows.Forms.RichTextBox()
         Me.lblOffert = New System.Windows.Forms.TextBox()
@@ -121,8 +121,8 @@ Partial Class usrCntlOfferte
         Me.dgvOfferteDetails.AllowUserToDeleteRows = False
         Me.dgvOfferteDetails.AllowUserToOrderColumns = True
         Me.dgvOfferteDetails.AllowUserToResizeRows = False
-        DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvOfferteDetails.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
+        Me.dgvOfferteDetails.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
         Me.dgvOfferteDetails.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -141,8 +141,8 @@ Partial Class usrCntlOfferte
         Me.dgvOfferte.AllowUserToAddRows = False
         Me.dgvOfferte.AllowUserToDeleteRows = False
         Me.dgvOfferte.AllowUserToResizeRows = False
-        DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvOfferte.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
+        Me.dgvOfferte.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
         Me.dgvOfferte.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.dgvOfferte.BackgroundColor = System.Drawing.Color.White

SDL/kunden/usrCntlOfferte.vb

@@ -808,4 +808,5 @@ Public Class usrCntlOfferte
 
     End Function
 
+
 End Class

SDL/mdm/frmMDMDatenverarbetiung.vb

@@ -15,6 +15,7 @@ Public Class frmMDMDatenverarbetiung
     ' Dim ProduktCode_NOT_IN = "SELECT plp_ProductCode FROM [tblPLOSE_Produktbeschreibung] WHERE  [plp_einarbeiten]=0 "
     Dim ProduktCode_NOT_IN = "'9020'"
     Dim datum As Date = Nothing
+    Dim test As Boolean = False
     Private Sub frmPloseDatenverarbetiung_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Me.Top = 0
         Me.Height = My.Computer.Screen.WorkingArea.Height
@@ -96,7 +97,7 @@ Public Class frmMDMDatenverarbetiung
                 End If
             Case "UTA"
                 If genRGAtt_UTA() Then
-                    If MautD_Befuellen() Then
+                    If Not test AndAlso MautD_Befuellen() Then
                         setFakturiert(LIEFERANT)
                     End If
                 End If
@@ -105,7 +106,7 @@ Public Class frmMDMDatenverarbetiung
                 MsgBox("Nicht verfügbar!")
             Case "MSE"
                 If genRGAtt_MSE() Then
-                    If MautD_Befuellen() Then
+                    If Not test AndAlso MautD_Befuellen() Then
                         setFakturiert(LIEFERANT)
                     End If
                 End If
@@ -375,14 +376,14 @@ Public Class frmMDMDatenverarbetiung
                         Offertenpositionen.LeistungsNr, 
                         Offertenpositionen.LeistungsBez, 
                         tblUTAFakturierwarenarten.Warenart, 
-                        tblUTAImport.*
+                        tblUTAImportNew.*
             FROM tblUTAFakturierwarenarten 
-            INNER JOIN (((Adressen INNER JOIN tblUTAImport ON Adressen.UTAKundenNr = tblUTAImport.Kundennummer) 
+            INNER JOIN (((Adressen INNER JOIN tblUTAImportNew ON Adressen.UTAKundenNr = tblUTAImportNew.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 (tblUTAImportNew.Lieferland = tblUTALeistungen.Lieferland) 
-                        AND (tblUTAImport.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart) 
+                        AND (tblUTAImportNew.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart) 
             as temp
             where temp.abgerechnet <> 1
             GROUP BY Kundennummer, KundenNr, [Name 1], LandKz, Ort, Lieferland, Kartennummer"
@@ -466,14 +467,18 @@ Public Class frmMDMDatenverarbetiung
         Dim displayFilter = False
         Dim sqlstr As String = ""
 
-        sqlstr &= " SELECT Adressen.AdressenNr as KundenNr, Adressen.[Name 1] as Name, trans.transaction_country AS Country,trans.device_product_type AS CardType, trans.device_product_number AS CardNr,Sum(trans.transaction_gross_amount) AS [Transaction Amount], Sum(trans.total_gross_amount) AS [Total Amount]
+        sqlstr &= " SELECT Adressen.AdressenNr as KundenNr, Adressen.[Name 1] as Name, trans.transaction_country AS Country,trans.device_product_type AS CardType, 
+                    /*trans.device_product_number AS CardNr,*/
+                        Sum(trans.transaction_gross_amount) AS [Transaction Amount], 
+                        Sum(trans.total_gross_amount) AS [Total Amount]
                        FROM [VERAG].[dbo].[tblMSESettlements] as bills 
                        left join [VERAG].[dbo].[tblMSETransactions] as trans on bills.[transaction_id] = trans.[transaction_id] 
                        left join [VERAG].[dbo].[tblMSECustomers] as cust on cust.partner_customer_number = trans.partner_haulier_id
                        left join [VERAG].[dbo].[tblMSEInvoices] as inv on inv.[invoice_id] = bills.[invoice_number] and inv.customer_number = cust.[customer_id] and trans.transaction_country = inv.country
                        left join adressen ON cust.[customer_id] = Adressen.MSEKundenNr 
                        where bills.invoice_date = '" & DateTimePicker2.Text & "' and trans.charged <> 1 
-                       GROUP BY Adressen.AdressenNr, Adressen.[Name 1], trans.transaction_country, trans.device_product_type, trans.device_product_number "
+                       GROUP BY Adressen.AdressenNr, Adressen.[Name 1], trans.transaction_country, trans.device_product_type--, trans.device_product_number 
+                       order by KundenNr"
 
         Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
         'DataGridView.DataSource = dt
@@ -500,7 +505,9 @@ Public Class frmMDMDatenverarbetiung
         rpt.lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
         rpt.lblBrutto.Text = "Total Amount"
         rpt.lblNetto.Text = "Transaction Amount"
-
+        rpt.Label4.Text = rpt.lblNetto.Text
+        rpt.Label2.Visible = False
+        rpt.Label14.Text = rpt.lblBrutto.Text
         'rpt.lblMandantNiederlassung.Text = PERSONAL.Mandant & "  /  " & PERSONAL.Niederlassung
 
         'Dim cnt As Integer = 0
@@ -520,7 +527,7 @@ Public Class frmMDMDatenverarbetiung
 
                                           rpt.lblKundennr.Text = SQL.isDbnullEmpty(rpt.Fields.Item("KundenNr").Value, "")
                                           rpt.lblName1.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Name").Value, "")
-                                          rpt.lblKartennr.Text = SQL.isDbnullEmpty(rpt.Fields.Item("CardType").Value, "") & "  - " & SQL.isDbnullEmpty(rpt.Fields.Item("Country").Value, "") & "  - " & SQL.isDbnullEmpty(rpt.Fields.Item("CardNr").Value, "")
+                                          rpt.lblKartennr.Text = SQL.isDbnullEmpty(rpt.Fields.Item("CardType").Value, "") & "  - " & SQL.isDbnullEmpty(rpt.Fields.Item("Country").Value, "") '& "  - " & SQL.isDbnullEmpty(rpt.Fields.Item("CardNr").Value, "")
 
                                           rpt.lblNetto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Transaction Amount").Value, 2, "")
                                           rpt.lblMWST.Text = "" 'SQL.isDbnullEmptyDbl(CDbl(rpt.Fields.Item("SummevonGesamtbetrag_Brutto_in_Darstellwährung").Value) - CDbl(rpt.Fields.Item("SummevonGesamtbetrag_Netto_in_Darstellwährung").Value), 2, "")
@@ -645,15 +652,15 @@ Public Class frmMDMDatenverarbetiung
 
             .SET_SQL("SELECT Kundennummer, KundenNr, [Name 1], LandKz, Ort, /*Lieferland, Kartennummer,*/ Sum(Gesamtbetrag_Netto_in_Darstellwährung) AS Netto, Sum(Gesamtbetrag_Brutto_in_Darstellwährung) AS Brutto 
                         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.*
+                        SELECT Adressen.AdressenNr, Adressen.[Name 1], Adressen.LandKz, Adressen.Ort, Adressen.UTAExportCSV, Adressen.Rechnungsdruck, Offertenpositionen.KundenNr, Offertenpositionen.OffertenNr, Offertenpositionen.LeistungsNr, Offertenpositionen.LeistungsBez, tblUTAFakturierwarenarten.Warenart, tblUTAImportNew.*
                         FROM tblUTAFakturierwarenarten 
                         INNER JOIN (((Adressen 
-                        		INNER JOIN tblUTAImport ON Adressen.UTAKundenNr = tblUTAImport.Kundennummer) 
+                        		INNER JOIN tblUTAImportNew ON Adressen.UTAKundenNr = tblUTAImportNew.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 (tblUTAImportNew.Lieferland = tblUTALeistungen.Lieferland) 
-                        		AND (tblUTAImport.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) 
+                        		AND (tblUTAImportNew.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) 
                         		ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart) as temp
                         where temp.abgerechnet <> 1
                         GROUP BY Kundennummer, KundenNr, [Name 1], LandKz, Ort", "FMZOLL")
@@ -735,7 +742,10 @@ Public Class frmMDMDatenverarbetiung
             'Exit Sub
             'MsgBox(.sql)
 
-            .SET_SQL("    SELECT Adressen.AdressenNr as KundenNr, Adressen.[Name 1] as Name, trans.transaction_country AS Country,trans.device_product_type AS CardType, Sum(trans.transaction_gross_amount) As [Transaktionsbetrag],Sum(trans.USteuer_EUR) As [USt Betrag], Sum(trans.total_gross_amount) As [Gesamtbetrag_Brutto]
+            .SET_SQL("    SELECT Adressen.AdressenNr as KundenNr, Adressen.[Name 1] as Name, trans.transaction_country AS Country,trans.device_product_type AS CardType, 
+                            Sum(trans.transaction_gross_amount) As [Transaktionsbetrag],
+                            Sum(trans.msts_fee_amount) As [Transaktionskosten],
+                            Sum(trans.total_gross_amount)  As [Gesamtbetrag]
                              FROM [VERAG].[dbo].[tblMSESettlements] as bills 
                              left join [VERAG].[dbo].[tblMSETransactions] as trans on bills.[transaction_id] = trans.[transaction_id] 
                              left join [VERAG].[dbo].[tblMSECustomers] as cust on cust.partner_customer_number = trans.partner_haulier_id
@@ -744,9 +754,8 @@ Public Class frmMDMDatenverarbetiung
                              where bills.invoice_date =  '" & DateTimePicker2.Text & "' and trans.charged <> 1 
                              GROUP BY Adressen.AdressenNr, Adressen.[Name 1], trans.transaction_country, trans.device_product_type", "FMZOLL")
 
-
             .LOAD()
-            'MsgBox(.GET_SQL())
+
             If .Columns.Count > 0 Then
 
                 '.Columns("AdressenNr").HeaderText = "KdNr"
@@ -796,16 +805,26 @@ Public Class frmMDMDatenverarbetiung
 
             End If
 
-            Dim sumBto As Double = 0
+            Dim sumGes As Double = 0
-            Dim sumNto As Double = 0
+            Dim sumFee As Double = 0
+            Dim sumTr As Double = 0
             For Each r As DataGridViewRow In .Rows
-                sumBto += If(IsNumeric(r.Cells("Gesamtbetrag_Brutto").Value), CDbl(r.Cells("Gesamtbetrag_Brutto").Value), 0)
+                sumGes += If(IsNumeric(r.Cells("Gesamtbetrag").Value), CDbl(r.Cells("Gesamtbetrag").Value), 0)
-                sumNto += If(IsNumeric(r.Cells("Transaktionsbetrag").Value), CDbl(r.Cells("Transaktionsbetrag").Value), 0)
+                sumTr += If(IsNumeric(r.Cells("Transaktionsbetrag").Value), CDbl(r.Cells("Transaktionsbetrag").Value), 0)
+                sumFee += If(IsNumeric(r.Cells("Transaktionskosten").Value), CDbl(r.Cells("Transaktionskosten").Value), 0)
             Next
 
             txtAnzahl.Text = .Rows.Count
-            txtPruefsummeNetto.Text = CDbl(sumNto).ToString("C2")
+            txtPruefsummeNetto.Text = CDbl(sumTr).ToString("C2")
-            txtPruefsummeBrutto.Text = CDbl(sumBto).ToString("C2")
+            txtPruefsummeBrutto.Text = CDbl(sumGes).ToString("C2")
+            txtTTRSum.Text = CDbl(sumFee).ToString("C2")
+
+            lblTTRSum.Visible = True
+            txtTTRSum.Visible = True
+
+            lblTTRSum.Text = "Tr-Kosten"
+
+
             .ClearSelection()
 
         End With
@@ -990,9 +1009,9 @@ Public Class frmMDMDatenverarbetiung
         'top = " TOP 20 "
         Dim SQLStr = " 	SELECT 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 (((Adressen INNER JOIN tblUTAImportNew ON Adressen.UTAKundenNr = tblUTAImportNew.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
+                        INNER JOIN tblUTALeistungen ON (tblUTALeistungen.VERAG_LeistungsNr = Offertenpositionen.LeistungsNr) AND (tblUTALeistungen.VERAG_OffertenNr = Offertenpositionen.OffertenNr) AND (tblUTAImportNew.Lieferland = tblUTALeistungen.Lieferland) AND (tblUTAImportNew.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart
                         where abgerechnet <> 1                        
                         group by Kundennummer, KundenNr, UTAExportCSV,Rechnungsdruck"
 
@@ -1017,7 +1036,7 @@ Public Class frmMDMDatenverarbetiung
 
             For Each csv As DataRow In distinctDT_CSV.Rows
 
-                Dim dt_CSV_selected = SQL.loadDgvBySql_Param("SELECT * FROM tblUTAImport where Kundennummer = " & csv.Item("Customer ID"), "FMZOLL")
+                Dim dt_CSV_selected = SQL.loadDgvBySql_Param("SELECT * FROM tblUTAImportNew where Kundennummer = " & csv.Item("Customer ID"), "FMZOLL")
                 dt_CSV_selected.ParentRelations.Clear()
                 dt_CSV_selected.ChildRelations.Clear()
                 dt_CSV_selected.Constraints.Clear()
@@ -1055,7 +1074,7 @@ Public Class frmMDMDatenverarbetiung
 
                 If verarbOK Then
                     'UPDATE Fakturiert
-                    SQL.doSQL("UPDATE [tblUTAImport] set abgerechnetDatum=GETDATE() where abgerechnetDatum is null and Kundennummer = " & UTA("Customer ID"), "FMZOLL")
+                    SQL.doSQL("UPDATE [tblUTAImportNew] set abgerechnetDatum=GETDATE() where abgerechnetDatum is null and Kundennummer = " & UTA("Customer ID"), "FMZOLL")
 
                 End If
 
@@ -1100,13 +1119,15 @@ Public Class frmMDMDatenverarbetiung
     Function genRGAtt_MSE() As Boolean
         Dim top = ""
         'top = " TOP 20 "
+        Dim sqlWhere = IIf(test, " and (cust.[customer_id] = 12229 or cust.[customer_id] = 13236 or cust.[customer_id] = 11836 or cust.[customer_id] = 14385)", "") 'zum testem
+
         Dim SQLStr = " 	SELECT distinct cust.customer_id as [Customer ID], Adressen.AdressenNr AS [Customer Nr], Adressen.MSEExportCSV, Adressen.Rechnungsdruck
                         FROM [VERAG].[dbo].[tblMSESettlements] as bills 
                         left join [VERAG].[dbo].[tblMSETransactions] as trans on bills.[transaction_id] = trans.[transaction_id] 
                         left join [VERAG].[dbo].[tblMSECustomers] as cust on cust.partner_customer_number = trans.partner_haulier_id
                         left join [VERAG].[dbo].[tblMSEInvoices] as inv on inv.[invoice_id] = bills.[invoice_number] and inv.customer_number = cust.[customer_id] and trans.transaction_country = inv.country
                         left join adressen ON cust.[customer_id] = Adressen.MSEKundenNr 
-                        where bills.invoice_date = '" & DateTimePicker2.Text & "' and trans.charged <> 0 and  (trans.transaction_gross_amount <> 0 or trans.[msts_fee_amount] <> 0)
+                        where bills.invoice_date = '" & DateTimePicker2.Text & "' and trans.charged <> 1 and  (trans.transaction_gross_amount <> 0 or trans.[msts_fee_amount] <> 0) " & sqlWhere & "
                         order by cust.customer_id"
 
         Dim dt_Main As DataTable = SQL.loadDgvBySql_Param(SQLStr, "FMZOLL", 1200)
@@ -1119,7 +1140,7 @@ Public Class frmMDMDatenverarbetiung
         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\MSE\Archiv\" & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "Test", "") & Now.ToShortDateString
+            Dim dir = IIf(test, "C:\Users\d.breimaier\Desktop\MSE\", "F:\FMZoll\MSE\Archiv\" & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "Test", "") & Now.ToShortDateString)
 
             If Directory.Exists(dir) Then dir &= "_" & Now.ToShortTimeString.Replace(":", "")
             Directory.CreateDirectory(dir)
@@ -1135,8 +1156,6 @@ Public Class frmMDMDatenverarbetiung
                                 SELECT controller_id as [Controller ID], 'VERAG 360 GmbH' as [Controller Name] , inv.[invoice_id] as [Invoice ID], inv.invoice_date as [Invoice Date], 
                                 cust.customer_id as [Customer ID], cust.partner_customer_number as [Customer No], cust.customer_name as [Customer name], bills.specification_page_name as [Specification Page], bills.specification_page_id as [Specification ID], trans.purchase_datetime as [Transaction date], trans.transaction_id as [Transaction ID], 
                                 trans.supplier_name as [Transaction Supplier/Terminal], trans.transaction_country as [Transaction Country], trans.transaction_product_name as [Product description], trans.transaction_product_id as [Product Description ID], trans.device_product_type as [Card Type], trans.device_product_number as [Card number], trans.license_plate_number as [Load File Licence Plate Number],
-                                
-                                
                                 '' as [Card Licence Plate Number], trans.license_plate_number as [Truck Licence Plate Number], '' as [Truck Fleet Code], '' as [Truck Driver Name], trans.entry_point_name as [Entry Terminal/Direction], trans.entry_datetime as [Start date], trans.entry_datetime as [Start Time], trans.exit_point_name as [Exit Terminal Description], trans.exit_datetime as [End Date], trans.exit_datetime as [End Time],
                                 ''  as [Eurovignet K-Number], '' as [LKW-Kostenstelle], trans.original_net_amount as [Original Nett Amount], trans.original_vat_amount as [Original VAT Amount], trans.original_gross_amount as [Original Amount], trans.original_currency as [Original Currency],
                                  trans.transaction_gross_amount as [Transaction Amount ( EUR )], trans.msts_fee_amount as [Admin Fee Amount ( EUR )], '' as [Fees and Costs Amount ( EUR )], trans.msts_vat_amount as [VAT Amount ( EUR )],trans.total_gross_amount as [Total Amount ( EUR )], ''  as [Total Dutch VAT ( EUR )], '' as [Total Foreign VAT ( EUR )], trans.[USteuer_EUR] as [USteuer_EUR]
@@ -1172,7 +1191,7 @@ Public Class frmMDMDatenverarbetiung
             For Each MSE In dt_Main.Rows
 
                 Dim SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch = Nothing
-                Dim verarbOK = True
+                Dim verarbOK = IIf(test, False, True)
 
                 If Not gen_SPEDBUCH_ByKdNr(MSE("Customer Nr"), SPEDBUCH, "MSE") Then verarbOK = False
                 If Not gen_RECHNUNG_BySPEDBUCH(MSE("Customer Nr"), SPEDBUCH, "MSE") Then verarbOK = False
@@ -1200,6 +1219,8 @@ Public Class frmMDMDatenverarbetiung
                 cnt += 1
             Next
 
+            If test Then Return True
+
             ' ANHÄNGE WERDEN NCIHT BENÖTIGT::
             'Alle Alangen im foglenden VZ löschen und die aktuellen kopieren
             Dim dirAnhang = "F:\FMZoll\MSE\Anlagen\" & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "Test", "") & Now.ToShortDateString
@@ -1691,8 +1712,8 @@ Public Class frmMDMDatenverarbetiung
 						  qryUTA_Fakturierungspositionen.Gesamtbetrag_Umsatzsteuer_in_Darstellwährung AS [VAT Amount]
 
                         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.*
+                        (SELECT Adressen.AdressenNr, Adressen.[Name 1], Adressen.LandKz, Adressen.Ort, Adressen.UTAExportCSV, Adressen.Rechnungsdruck, Offertenpositionen.KundenNr, Offertenpositionen.OffertenNr, Offertenpositionen.LeistungsNr, Offertenpositionen.LeistungsBez, tblUTAFakturierwarenarten.Warenart, tblUTAImportNew.*
-                        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
+                        FROM tblUTAFakturierwarenarten INNER JOIN (((Adressen INNER JOIN tblUTAImportNew ON Adressen.UTAKundenNr = tblUTAImportNew.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 (tblUTAImportNew.Lieferland = tblUTALeistungen.Lieferland) AND (tblUTAImportNew.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart
                             WHERE Offertenpositionen.KundenNr=" & sqlWhere & " 
                         ) as qryUTA_Fakturierungspositionen
                         WHERE (((qryUTA_Fakturierungspositionen.Gesamtbetrag_Brutto_in_Darstellwährung)<>0))
@@ -1787,17 +1808,16 @@ Public Class frmMDMDatenverarbetiung
                     trans.device_product_number as [Card Number], 
                     trans.entry_point_name as [Entry Terminal],
                     trans.exit_point_name as [Exit Terminal], 
-                    sum(trans.total_gross_amount) - sum(trans.USteuer_EUR) As [Nett Amount],
+                    case when trans.device_product_type like '%System Fee' then (msts_fee_amount + transaction_gross_amount) - trans.USteuer_EUR else transaction_gross_amount - trans.USteuer_EUR End As [Nett Amount],
-                    Sum(trans.USteuer_EUR) As [VAT Amount], 
+                    trans.USteuer_EUR As [VAT Amount], 
-                    Sum(trans.total_gross_amount)  As [Total Amount]
+                    case when trans.device_product_type like '%System Fee' then msts_fee_amount + transaction_gross_amount else transaction_gross_amount End as [Total Amount]
                        From [VERAG].[dbo].[tblMSESettlements] as bills 
                        left Join [VERAG].[dbo].[tblMSETransactions] as trans on bills.[transaction_id] = trans.[transaction_id] 
                        left Join [VERAG].[dbo].[tblMSECustomers] as cust on cust.partner_customer_number = trans.partner_haulier_id
                        left Join [VERAG].[dbo].[tblMSEInvoices] as inv on inv.[invoice_id] = bills.[invoice_number] And inv.customer_number = cust.[customer_id] And trans.transaction_country = inv.country
                        Left Join adressen ON cust.[customer_id] = Adressen.MSEKundenNr 
                        where bills.invoice_date = '" & DateTimePicker2.Text & "' and trans.chargedDatetime is not null " & sqlWhere &
-                        "GROUP BY Adressen.AdressenNr,trans.license_plate_number,cast(trans.[purchase_datetime] as Date), trans.transaction_country,trans.device_product_type, trans.device_product_number, trans.entry_point_name ,trans.exit_point_name
+                        "order by Adressen.AdressenNr "
-                        order by Adressen.AdressenNr "
 
             Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
 
@@ -2066,8 +2086,8 @@ Public Class frmMDMDatenverarbetiung
                         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.*
+                        (SELECT Adressen.AdressenNr, Adressen.[Name 1], Adressen.LandKz, Adressen.Ort, Adressen.UTAExportCSV, Adressen.Rechnungsdruck, Offertenpositionen.KundenNr, Offertenpositionen.OffertenNr, Offertenpositionen.LeistungsNr, Offertenpositionen.LeistungsBez, tblUTAFakturierwarenarten.Warenart, tblUTAImportNew.*
-                        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
+                        FROM tblUTAFakturierwarenarten INNER JOIN (((Adressen INNER JOIN tblUTAImportNew ON Adressen.UTAKundenNr = tblUTAImportNew.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 (tblUTAImportNew.Lieferland = tblUTALeistungen.Lieferland) AND (tblUTAImportNew.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart
                             WHERE Offertenpositionen.KundenNr='" & KdNr & "'
                         ) as qryUTA_Fakturierungspositionen
                         WHERE (((qryUTA_Fakturierungspositionen.Gesamtbetrag_Brutto_in_Darstellwährung)<>0))
@@ -2256,13 +2276,18 @@ Public Class frmMDMDatenverarbetiung
                                 trans.supplier_name as [Transaction Supplier/Terminal], trans.transaction_country as [Transaction Country], trans.transaction_product_name as [Product description], trans.purchase_datetime as [Transaction date],trans.device_product_type as [Card Type], trans.device_product_number as [Card number], trans.license_plate_number as [LicencePlateNumber],
                                  trans.entry_point_name as [Entry Terminal/Direction], trans.entry_datetime as [Start date], trans.entry_datetime as [Start Time], trans.exit_point_name as [Exit Terminal Description], trans.exit_datetime as [End Date], trans.exit_datetime as [End Time],
                                  trans.original_net_amount as [Original Nett Amount], trans.original_vat_amount as [Original VAT Amount], trans.original_gross_amount as [Original Amount], trans.original_currency as [Original Currency],
-                                 trans.transaction_gross_amount as [Transaction Amount ( EUR )], trans.msts_fee_amount as [Admin Fee Amount ( EUR )], '' as [Fees and Costs Amount ( EUR )], trans.msts_vat_amount as [VAT Amount ( EUR )],trans.total_gross_amount as [Total Amount ( EUR )], ''  as [Total Dutch VAT ( EUR )], '' as [Total Foreign VAT ( EUR )], trans.[USteuer_EUR] as [USteuer_EUR]
+                            case when trans.device_product_type like '%System Fee' then msts_fee_amount + transaction_gross_amount
+                                else transaction_gross_amount End as [Transaction Amount ( EUR )], 
+                               trans.msts_fee_amount as [Admin Fee Amount ( EUR )], '' as [Fees and Costs Amount ( EUR )], 
+                               trans.msts_vat_amount as [VAT Amount ( EUR )],trans.total_gross_amount as [Total Amount ( EUR )], 
+                            ''  as [Total Dutch VAT ( EUR )],
+                            '' as [Total Foreign VAT ( EUR )], trans.[USteuer_EUR] as [USteuer_EUR]
+
                                 FROM [VERAG].[dbo].[tblMSESettlements] as bills 
                                 left join [VERAG].[dbo].[tblMSETransactions] as trans on bills.[transaction_id] = trans.[transaction_id] 
                                 left join [VERAG].[dbo].[tblMSECustomers] as cust on cust.partner_customer_number = trans.partner_haulier_id
                                 left join [VERAG].[dbo].[tblMSEInvoices] as inv on inv.[invoice_id] = bills.[invoice_number] and inv.customer_number = cust.[customer_id] and trans.transaction_country = inv.country
-                                where bills.invoice_date = '" & DateTimePicker2.Text & "' and (trans.transaction_gross_amount <> 0 or [msts_fee_amount] <> 0) and cust.[customer_id] = " & MSEKdNr
+                                where bills.invoice_date = '" & DateTimePicker2.Text & "' and (trans.transaction_gross_amount <> 0 or [msts_fee_amount] <> 0) and cust.[customer_id] = " & MSEKdNr & " order by trans.license_plate_number"
-
 
             Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
             If dt Is DBNull.Value Then Return ""
@@ -2290,7 +2315,7 @@ Public Class frmMDMDatenverarbetiung
             rpt.txtMWSTKatSum.Visible = False
             rpt.lblMWST.Visible = False
 
-            rpt.lblBrutto.Text = "Total Amount ( EUR )"
+            rpt.lblBrutto.Text = "Transaction Amount(EUR)"
             rpt.Label4.Text = bis.ToShortDateString
             rpt.Label2.Text = "MSE-KundenNr:"
             rpt.TextBox1.Text = MSEKdNr
@@ -2339,11 +2364,11 @@ Public Class frmMDMDatenverarbetiung
                                               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.txtNetto.Text = "" 'SQL.isDbnullEmptyDbl(rpt.Fields.Item("Transaction Amount ( EUR )").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)
+                                              sumNetto += 0 'SQL.isDbnullEmptyDbl(rpt.Fields.Item("Transaction Amount ( EUR )").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
@@ -2656,7 +2681,7 @@ Public Class frmMDMDatenverarbetiung
             SPEDBUCH.Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
 
 
-            Return SPEDBUCH.SAVE
+            Return IIf(test, True, SPEDBUCH.SAVE)
 
         Catch ex As System.Exception
             VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
@@ -2982,13 +3007,13 @@ Public Class frmMDMDatenverarbetiung
 
                     useNettogesamtbetrag = False
 
-                    sqlstr = " SELECT Adressen.AdressenNr, Adressen.[Name 1], Adressen.LandKz, Adressen.Ort,Offertenpositionen.OffertenNr, Offertenpositionen.LeistungsNr, Offertenpositionen.LeistungsBez, tblUTAFakturierwarenarten.Warenart, tblUTAImport.Fakturierwarenart,sum(tblUTAImport.Gesamtbetrag_Netto_in_Lieferlandwährung) as Netto ,sum(tblUTAImport.Gesamtbetrag_Brutto_in_Lieferlandwährung) as Brutto
+                    sqlstr = " SELECT Adressen.AdressenNr, Adressen.[Name 1], Adressen.LandKz, Adressen.Ort,Offertenpositionen.OffertenNr, Offertenpositionen.LeistungsNr, Offertenpositionen.LeistungsBez, tblUTAFakturierwarenarten.Warenart, tblUTAImportNew.Fakturierwarenart,sum(tblUTAImportNew.Gesamtbetrag_Netto_in_Lieferlandwährung) as Netto ,sum(tblUTAImportNew.Gesamtbetrag_Brutto_in_Lieferlandwährung) as Brutto
                         FROM tblUTAFakturierwarenarten 
-                        INNER JOIN (((Adressen INNER JOIN tblUTAImport ON Adressen.UTAKundenNr = tblUTAImport.Kundennummer) 
+                        INNER JOIN (((Adressen INNER JOIN tblUTAImportNew ON Adressen.UTAKundenNr = tblUTAImportNew.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
+                        INNER JOIN tblUTALeistungen ON (tblUTALeistungen.VERAG_LeistungsNr = Offertenpositionen.LeistungsNr) AND (tblUTALeistungen.VERAG_OffertenNr = Offertenpositionen.OffertenNr) AND (tblUTAImportNew.Lieferland = tblUTALeistungen.Lieferland) AND (tblUTAImportNew.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart
                         where Offertenpositionen.LeistungsNr is not null AND Offertenpositionen.OffertenNr = " & OffertenNr & " AND Offertenpositionen.KundenNr  = " & KdNr &
-                        "group by Adressen.AdressenNr, Adressen.[Name 1], Adressen.LandKz, Adressen.Ort, Offertenpositionen.OffertenNr, Offertenpositionen.LeistungsNr, Offertenpositionen.LeistungsBez, tblUTAFakturierwarenarten.Warenart,tblUTAImport.Fakturierwarenart"
+                        "group by Adressen.AdressenNr, Adressen.[Name 1], Adressen.LandKz, Adressen.Ort, Offertenpositionen.OffertenNr, Offertenpositionen.LeistungsNr, Offertenpositionen.LeistungsBez, tblUTAFakturierwarenarten.Warenart,tblUTAImportNew.Fakturierwarenart"
 
                     Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
 
@@ -3007,6 +3032,7 @@ Public Class frmMDMDatenverarbetiung
 
 
                 Case "MSE"
+                    'des is da schass!!!!
                     '                Case 23 'MSE Maut
                     '5070                             Select Case ![LeistungsNr]
                     '                                     Case 134  'Frejus - Tunnelmaut (20.01.2011)
@@ -3020,6 +3046,11 @@ Public Class frmMDMDatenverarbetiung
                     '5150                                     End If
                     '5160                                     rst.Close
                     '5170                                     Set rst = Nothing
+
+                    'qryReErfSchOpt6BeträgeLNr134
+
+
+
                     '5180                                 Case 141  'MSC Ressa - alle Länder
                     '5190                                     Set rst = OpenParameterQuery("qryReErfSchOpt6BeträgeLNr141", eOpensnapshot, "prmAdressenNr:=" & rstRK![RechnungsKundenNr])
                     '5200                                     If Not rst.EOF Then
@@ -3031,6 +3062,10 @@ Public Class frmMDMDatenverarbetiung
                     '5260                                     End If
                     '5270                                     rst.Close
                     '5280                                     Set rst = Nothing
+
+                    'qryReErfSchOpt6BeträgeLNr141
+
+
                     '5290                                 Case Else 'alle anderen MSE Transactions
                     '5300                                     Set rst = OpenParameterQuery("qryReErfSchOpt6Beträge", eOpensnapshot, "prmAdressenNr:=" & rstRK![RechnungsKundenNr], "prmLeistungsNr:=" & ![LeistungsNr])
                     '5310                                     If Not rst.EOF Then
@@ -3044,17 +3079,24 @@ Public Class frmMDMDatenverarbetiung
                     '5390                                     Set rst = Nothing
                     '5400                             End Select
 
+                    'qryReErfSchOpt6Beträge
+
+
 
                     useNettogesamtbetrag = False
-
+                    'alles steuerfrei also Brutto = Netto
-                    sqlstr = "select cust.[customer_id], trans.device_product_type, Offertenpositionen.LeistungsNr , sum(trans.total_gross_amount) as Brutto, sum(trans.total_gross_amount) - sum(trans.USteuer_EUR) as Netto
+                    sqlstr = "select customer_id, LeistungsNr,  sum(Netto) as Netto, Sum (Brutto) as Brutto from (select cust.[customer_id], trans.device_product_type, Offertenpositionen.LeistungsNr , 
+                                case when trans.device_product_type like '%System Fee' then sum(msts_fee_amount) + sum(transaction_gross_amount) 
+                                else sum(transaction_gross_amount) End as Netto,
+                                case when trans.device_product_type like '%System Fee' then sum(msts_fee_amount) + sum(transaction_gross_amount) 
+                                else sum(transaction_gross_amount) End as Brutto
                                 FROM [VERAG].[dbo].[tblMSESettlements] as bills 
-                                inner join [VERAG].[dbo].[tblMSETransactions] as trans on bills.[transaction_id] = trans.[transaction_id] 
+                                left join [VERAG].[dbo].[tblMSETransactions] as trans on bills.[transaction_id] = trans.[transaction_id] 
-                                inner join [VERAG].[dbo].[tblMSECustomers] as cust on cust.partner_customer_number = trans.partner_haulier_id
+                                left join [VERAG].[dbo].[tblMSECustomers] as cust on cust.partner_customer_number = trans.partner_haulier_id
-                                INNER JOIN tblMSELeistungen ON (tblMSELeistungen.[Card Type] = trans.device_product_type)  AND (tblMSELeistungen.[Transaction Country] = trans.transaction_country)
+                                left JOIN tblMSELeistungen ON (tblMSELeistungen.[Card Type] = trans.device_product_type)  AND (tblMSELeistungen.[Transaction Country] = trans.transaction_country)
-                                INNER JOIN Offertenpositionen ON cust.partner_customer_number = Offertenpositionen.KundenNr and tblMSELeistungen.LeistungsNr  = Offertenpositionen.LeistungsNr and Offertenpositionen.OffertenNr = " & OffertenNr & "
+                                left JOIN Offertenpositionen ON cust.partner_customer_number = Offertenpositionen.KundenNr and tblMSELeistungen.LeistungsNr  = Offertenpositionen.LeistungsNr and Offertenpositionen.OffertenNr = " & OffertenNr & "
                                 where bills.invoice_date = '" & DateTimePicker2.Text & "' and trans.charged = 0 and  cust.[partner_customer_number] = " & KdNr & "
-                                group by cust.[customer_id], trans.device_product_type, Offertenpositionen.LeistungsNr , Offertenpositionen.LeistungsBez"
+                                group by cust.[customer_id], trans.device_product_type, Offertenpositionen.LeistungsNr , Offertenpositionen.LeistungsBez ) as temp group by customer_id, LeistungsNr"
 
                     Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
 
@@ -3087,7 +3129,7 @@ Public Class frmMDMDatenverarbetiung
             Call usrCntlFaktAbrechnung.przPP(RG)          ' Porto/Papiere errechnen
             Call usrCntlFaktAbrechnung.przBS415(RG)       ' Bankspesen errechnen
 
-            Return RG.SAVE
+            Return IIf(test, True, RG.SAVE)
 
         Catch ex As System.Exception
             VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
@@ -3380,23 +3422,23 @@ Public Class frmMDMDatenverarbetiung
         pruefData_UTA = True
         Try
 
-            Dim dtUTAKundennummern As DataTable = SQL.loadDgvBySql("SELECT Distinct(tblUTAImport.Kundennummer)
+            Dim dtUTAKundennummern As DataTable = SQL.loadDgvBySql("SELECT Distinct(tblUTAImportNew.Kundennummer)
-            FROM tblUTAImport LEFT JOIN Adressen ON tblUTAImport.Kundennummer = Adressen.UTAKundenNr
+            FROM tblUTAImportNew LEFT JOIN Adressen ON tblUTAImportNew.Kundennummer = Adressen.UTAKundenNr
-            GROUP BY tblUTAImport.Kundennummer, Adressen.UTAKundenNr
+            GROUP BY tblUTAImportNew.Kundennummer, Adressen.UTAKundenNr
             HAVING (((Adressen.UTAKundenNr) Is Null))", "FMZOLL")
 
             If dtUTAKundennummern.Rows.Count > 0 Then
 
                 pruefData_UTA = False
 
-                If dtUTAKundennummern.Rows.Count = 1 AndAlso dtUTAKundennummern.Rows(0).Item("Kundennummer").Value = "868070" Then pruefData_UTA = True 'ist VERAG -> OK
+                If dtUTAKundennummern.Rows.Count = 1 AndAlso dtUTAKundennummern.Rows(0).Item("Kundennummer") = 868070 Then pruefData_UTA = True 'ist VERAG -> OK
 
             End If
 
 
-            Dim dtUTAFakturierwarenarten As DataTable = SQL.loadDgvBySql("SELECT tblUTAImport.Fakturierwarenart, tblUTAImport.Lieferland
+            Dim dtUTAFakturierwarenarten As DataTable = SQL.loadDgvBySql("SELECT tblUTAImportNew.Fakturierwarenart, tblUTAImportNew.Lieferland
-            FROM tblUTAImport LEFT JOIN tblUTALeistungen ON (tblUTAImport.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart) AND (tblUTAImport.Lieferland = tblUTALeistungen.Lieferland)
+            FROM tblUTAImportNew LEFT JOIN tblUTALeistungen ON (tblUTAImportNew.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart) AND (tblUTAImportNew.Lieferland = tblUTALeistungen.Lieferland)
-            GROUP BY tblUTAImport.Fakturierwarenart, tblUTAImport.Lieferland, tblUTALeistungen.Fakturierwarenart, tblUTALeistungen.Lieferland
+            GROUP BY tblUTAImportNew.Fakturierwarenart, tblUTAImportNew.Lieferland, tblUTALeistungen.Fakturierwarenart, tblUTALeistungen.Lieferland
             HAVING (((tblUTALeistungen.Fakturierwarenart) Is Null) AND ((tblUTALeistungen.Lieferland) Is Null))", "FMZOLL")
 
 
@@ -3406,7 +3448,7 @@ Public Class frmMDMDatenverarbetiung
 
             End If
 
-            Dim dtUTAOffertenPositionen As DataTable = SQL.loadDgvBySql("SELECT * FROM vwUTA_PrüfungInkonsistenzVERAGOffertenpositionen2", "FMZOLL")
+            Dim dtUTAOffertenPositionen As DataTable = SQL.loadDgvBySql("SELECT * FROM vwUTA_PrüfungInkonsistenzVERAGOffertenpositionen2_new", "FMZOLL")
 
             If dtUTAOffertenPositionen.Rows.Count > 0 Then
 
@@ -3626,7 +3668,7 @@ Public Class frmMDMDatenverarbetiung
                     PictureBox1.Visible = True
                 End If
             Case "UTA"
-                If SQL.doSQL("UPDATE [tblUTAImport] set abgerechnet=1 where abgerechnetDatum is not null and abgerechnet <> 1", "FMZOLL") Then
+                If SQL.doSQL("UPDATE [tblUTAImportNew] set abgerechnet=1 where abgerechnetDatum is not null and abgerechnet <> 1", "FMZOLL") Then
                     PictureBox1.Visible = True
                 End If
             Case "MSE"
@@ -3773,6 +3815,7 @@ Public Class frmMDMDatenverarbetiung
                         txtTTRSum.Text = CDbl(pruefSumTTR).ToString("C2")
                         lblTTRSum.Visible = True
                         txtTTRSum.Visible = True
+                        lblTTRSum.Text = "Prüfsumme TTR:"
                     Else
                         lblTTRSum.Visible = False
                         txtTTRSum.Visible = False

SDL/mdm/rptASFINAG_TransaktionenSumary.Designer.vb

@@ -166,7 +166,7 @@ Partial Public Class rptASFINAG_TransaktionenSumary
         'Detail
         '
         Me.Detail.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lblKartennr, Me.lblKundennr, Me.lblBrutto, Me.Line3, Me.lblNetto, Me.lblMWST, Me.lblName1, Me.lblSumNet, Me.lblSumVat, Me.lblSumBrt, Me.Label10})
-        Me.Detail.Height = 0.759859!
+        Me.Detail.Height = 0.8119423!
         Me.Detail.Name = "Detail"
         '
         'lblKartennr
@@ -414,7 +414,7 @@ Partial Public Class rptASFINAG_TransaktionenSumary
         'ReportFooter1
         '
         Me.ReportFooter1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Line1, Me.lblLandFooter, Me.Line7, Me.lblSumBrutto, Me.lblSumMwst, Me.lblSumNetto, Me.lblSumMenge})
-        Me.ReportFooter1.Height = 0.6340059!
+        Me.ReportFooter1.Height = 0.84375!
         Me.ReportFooter1.KeepTogether = True
         Me.ReportFooter1.Name = "ReportFooter1"
         '
@@ -570,14 +570,14 @@ Partial Public Class rptASFINAG_TransaktionenSumary
     Public WithEvents lblKartennr As GrapeCity.ActiveReports.SectionReportModel.Label
     Private WithEvents Line3 As GrapeCity.ActiveReports.SectionReportModel.Line
     Private WithEvents Label8 As GrapeCity.ActiveReports.SectionReportModel.Label
-    Private WithEvents Label14 As GrapeCity.ActiveReports.SectionReportModel.Label
+    Public WithEvents Label14 As GrapeCity.ActiveReports.SectionReportModel.Label
     Private WithEvents Line4 As GrapeCity.ActiveReports.SectionReportModel.Line
     Public WithEvents ReportFooter1 As GrapeCity.ActiveReports.SectionReportModel.ReportFooter
     Public WithEvents lblLandFooter As GrapeCity.ActiveReports.SectionReportModel.Label
     Private WithEvents Line7 As GrapeCity.ActiveReports.SectionReportModel.Line
-    Private WithEvents Label1 As GrapeCity.ActiveReports.SectionReportModel.Label
+    Public WithEvents Label1 As GrapeCity.ActiveReports.SectionReportModel.Label
-    Private WithEvents Label2 As GrapeCity.ActiveReports.SectionReportModel.Label
+    Public WithEvents Label2 As GrapeCity.ActiveReports.SectionReportModel.Label
-    Private WithEvents Label4 As GrapeCity.ActiveReports.SectionReportModel.Label
+    Public WithEvents Label4 As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblBrutto As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblNetto As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblMWST As GrapeCity.ActiveReports.SectionReportModel.Label

SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_divers.vb

@@ -302,22 +302,24 @@ Public Class usrCntlMDMDatenverarbeitungAuswertungen_divers
 
             Case "KDNR"
 
-                sqlstr = "SELECT tblUTAImport.Kundennummer as 'fehlende UTA-Kundennummer'
+                sqlstr = "SELECT tblUTAImportNew.Kundennummer as 'fehlende UTA-Kundennummer'
-                FROM tblUTAImport LEFT JOIN Adressen ON tblUTAImport.Kundennummer = Adressen.UTAKundenNr
+                FROM tblUTAImportNew LEFT JOIN Adressen ON tblUTAImportNew.Kundennummer = Adressen.UTAKundenNr
-                GROUP BY tblUTAImport.Kundennummer, Adressen.UTAKundenNr
+                Where UTAKundenNr <> 868070
+                GROUP BY tblUTAImportNew.Kundennummer, Adressen.UTAKundenNr
                 HAVING (((Adressen.UTAKundenNr) Is Null))"
 
             Case "FKWA"
 
-                sqlstr = "SELECT tblUTAImport.Fakturierwarenart as Fakturierwarenart, tblUTAImport.Lieferland as Lieferland
+
-                FROM tblUTAImport LEFT JOIN tblUTALeistungen ON (tblUTAImport.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart) AND (tblUTAImport.Lieferland = tblUTALeistungen.Lieferland)
+                sqlstr = "SELECT tblUTAImportNew.Fakturierwarenart as Fakturierwarenart, tblUTAImportNew.Lieferland as Lieferland
-                GROUP BY tblUTAImport.Fakturierwarenart, tblUTAImport.Lieferland, tblUTALeistungen.Fakturierwarenart, tblUTALeistungen.Lieferland
+                FROM tblUTAImportNew LEFT JOIN tblUTALeistungen ON (tblUTAImportNew.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart) AND (tblUTAImportNew.Lieferland = tblUTALeistungen.Lieferland)
+                GROUP BY tblUTAImportNew.Fakturierwarenart, tblUTAImportNew.Lieferland, tblUTALeistungen.Fakturierwarenart, tblUTALeistungen.Lieferland
                 HAVING (((tblUTALeistungen.Fakturierwarenart) Is Null) AND ((tblUTALeistungen.Lieferland) Is Null))"
 
 
             Case "OP"
 
-                sqlstr = "SELECT * FROM vwUTA_PrüfungInkonsistenzVERAGOffertenpositionen2"
+                sqlstr = "SELECT * FROM vwUTA_PrüfungInkonsistenzVERAGOffertenpositionen2_new"
 
             Case Else
                 MsgBox("Auswertungsart nicht definiert!")

VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb

@@ -15,7 +15,7 @@ Public Class frmMessenger
     Dim topMessagesDateHistory As Object = Nothing
     Dim loaded = False
     Public EMOJI_PATH_MAIN = DATENVERVER_OPTIONS.getRootDir & "\DOKUMENTE\CHAT_EMOJIS\"
-    Public EMOJI_PATH = ""
+    Public EMOJI_PATH = cAllgemein.EMOJI_PATH
     Public AvisoId As Integer = -1
     Public SendungID As Integer = -1
 
@@ -67,6 +67,7 @@ Public Class frmMessenger
         Catch ex As Exception
             VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
         End Try
+
     End Sub
     Private Sub MyDatagridview1_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvChats.CellContentClick, dgvChats.CellClick
         If dgvChats.Rows(e.RowIndex).Cells("ungelesen").Value <> "" Then
@@ -86,7 +87,7 @@ Public Class frmMessenger
     End Sub
 
     Private Sub frmMessenger_Load(sender As Object, e As EventArgs) Handles Me.Load
-        initEMOJI_PATH()
+        'initEMOJI_PATH()
         VERAG_PROG_ALLGEMEIN.cProgramFunctions.SetDoubleBuffered(MyFlowLayoutPanel1)
         rtbChatMessage.AllowDrop = True
         MSG_LISTENDER.START()

VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb

@@ -1139,8 +1139,11 @@ Public Class cMSEAPI
             'R("distance_km") = transaction.StringOf("distance_km")
 
 
-            If ((transaction.StringOf("device_product_type") = "" Or transaction.StringOf("device_product_type") = "null") And CDbl(transaction.StringOf("msts_fee_amount").Replace(".", ",")) <> 0) Then
+            If (CDbl(transaction.StringOf("msts_fee_amount").Replace(".", ",")) <> 0) Then
-                R("device_product_type") = transaction.StringOf("transaction_product_name")
+                If (transaction.StringOf("device_product_type") = "" Or transaction.StringOf("device_product_type") = "null") Then
+                    R("device_product_type") = transaction.StringOf("transaction_product_name")
+                End If
+
             End If
 
             If ((transaction.StringOf("device_product_type") = "" Or transaction.StringOf("device_product_type") = "null") And transaction.StringOf("transaction_product_name") = "Charge - HU-GO SIM card fee") Then

VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj

@@ -1421,6 +1421,9 @@
     <Content Include="My Project\licensePDFPro.elic.xml" />
     <Content Include="My Project\licensePDFViewer.elic.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Resources\CHAT_EMOJIS\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <ProjectExtensions />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

VERAG_PROG_ALLGEMEIN/cAllgemein.vb

@@ -60,6 +60,7 @@ Public Class cAllgemein
     Public Shared SESSION As New cSession
     Public Shared _DummyCNT As Integer
     Public Shared EMailTOBB_Error As String = "info@verimextransit.com"
+    Public Shared EMOJI_PATH As String = ""
 
 
     Shared SQL As New SQL
@@ -133,6 +134,7 @@ Public Class cAllgemein
         LOAD_TRANSLATE_AUTO()
         LOAD_FIRMEN()
         LOAD_FILIALEN()
+        LOAD_CHAT_EMOJIS()
 
         Try 'DRUCKER LADEN
             Dim sPrinters As New ArrayList
@@ -154,6 +156,36 @@ Public Class cAllgemein
 
     End Sub
 
+    Public Shared Sub LOAD_CHAT_EMOJIS()
+
+        Dim EMOJI_SOURCEPATH = DATENVERVER_OPTIONS.getRootDir & "\DOKUMENTE\CHAT_EMOJIS\"
+
+        EMOJI_PATH = System.IO.Path.GetFullPath(My.Application.Info.DirectoryPath & "\Resources\CHAT_EMOJIS\")
+
+        Try
+            If Not System.IO.Directory.Exists(EMOJI_PATH) Then
+                System.IO.Directory.CreateDirectory(EMOJI_PATH)
+            End If
+
+
+            For Each f In System.IO.Directory.GetFiles(EMOJI_PATH)
+                System.IO.File.Delete(f)
+            Next
+
+
+            For Each f In System.IO.Directory.GetFiles(EMOJI_SOURCEPATH)
+                Dim fi As New System.IO.FileInfo(f)
+                fi.CopyTo(EMOJI_PATH & fi.Name, False)
+
+            Next
+
+
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+
+    End Sub
+
     Public Shared Sub LOAD_PROGRAMM()
         Dim prog_Name = My.Application.Info.ProductName