Maut, QU-Kontrolle, MAhnlauf, Kundebearbeiten, etc.

2024-09-06 15:40:58 +02:00
parent ad7fa10999
commit a9228921e0
32 changed files with 6225 additions and 1100 deletions
--- a/SDL/Formulare/KDFormulare/frmFormulare.vb
+++ b/SDL/Formulare/KDFormulare/frmFormulare.vb
@@ -1626,48 +1626,55 @@ Public Class FormularManagerNEU
    End Function

    Shared Function VM_MDM_BHI(usrCntl As usrcntlVollmacht_MDM_BHI) As String
-
-        'aktuell nur als PDF
-
-        Dim list As New List(Of VERAG_PROG_ALLGEMEIN.MyListItem)
-        Dim fm As New VERAG_PROG_ALLGEMEIN.cFormularManager
-        list = fm.getPDFFields_Editierbar("DOKUMENTE", "VORLAGEN", "VOLLMACHTEN", "MDM", "", "VM_BHI_" & usrCntl.cboLand._value)
+        Try


-        Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues)
-        Dim listItem2 As New List(Of VERAG_PROG_ALLGEMEIN.MyListItem)
-        For Each item In list
+            'aktuell nur als PDF

-            Select Case item.Text.ToLower().Trim()
-                Case "name" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtFirma.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.txt_GF_Name.Text))
-                Case "surname" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_Name.Text))
-                Case "firstname" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_Name.Text))
-                Case "place" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtOrt.Text))
-                Case "place_date" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtOrt.Text & " " & usrCntl.datDatum.ToString("ddMMyyyy")))
-                Case "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))
+            Dim list As New List(Of VERAG_PROG_ALLGEMEIN.MyListItem)
+            Dim fm As New VERAG_PROG_ALLGEMEIN.cFormularManager
+            list = fm.getPDFFields_Editierbar("DOKUMENTE", "VORLAGEN", "VOLLMACHTEN", "MDM", "", "VM_BHI_" & usrCntl.cboLand._value)

-            End Select

-            'surname_firstname
-            'surname
-            'lastname
-            'place_date
-            'vat_country
-            'place
-            'c_mailcontact
+            Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues)
+            Dim listItem2 As New List(Of VERAG_PROG_ALLGEMEIN.MyListItem)
+            For Each item In list

-        Next
+                Select Case item.Text.ToLower().Trim()
+                    Case "name" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtFirma.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._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_Name.Text))
+                    Case "function" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(usrCntl.txt_GF_Name.Text <> "", "CEO", "")))
+                    Case "surname" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_Name.Text))
+                    Case "firstname" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_Name.Text))
+                    Case "place" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtOrt.Text))
+                    'Case "place_date" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtOrt.Text & " " & IIf(IsDate(usrCntl.datDatum.Text), usrCntl.datDatum.Text, ""))) ->  soll nicht gesetzt werden
+                    Case "capital" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtKapital.Text & " " & usrCntl.cbxKapitalWahrung._value))
+                    Case "crnumber" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txtHRNr.Text))

-        Return fm.fillPDF_Editierbar("DOKUMENTE", "VORLAGEN", "VOLLMACHTEN", "MDM", "", "VM_BHI_" & usrCntl.cboLand._value, listItem2, listTowrite,,,,,, False)
+                End Select

+                'surname_firstname
+                'surname
+                'lastname
+                'place_date
+                'vat_country
+                'place
+                'c_mailcontact
+
+            Next
+
+            Return fm.fillPDF_Editierbar("DOKUMENTE", "VORLAGEN", "VOLLMACHTEN", "MDM", "", "VM_BHI_" & usrCntl.cboLand._value, listItem2, listTowrite,,,,,, False)
+
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
    End Function


@@ -1708,7 +1715,7 @@ Public Class FormularManagerNEU
                    Case "name_2" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtFirma.Text
                    Case "address" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse1.Text & " " & usrCntl.cbxLandKz.Text & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text
                    Case "zipcode" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse2.Text
-                    Case "country" : odoc.FormFields(fieldName).Range.Text = usrCntl.cbxLandKz.Text
+                    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, "")
@@ -1716,6 +1723,7 @@ Public Class FormularManagerNEU
                    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_Name.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
@@ -1728,11 +1736,11 @@ Public Class FormularManagerNEU
                    Case "c_zipcode" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Ort
                    Case "c_vatno" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_UID
                    Case "c_phone" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Telefon & " " & FIRMA.Firma_Telefax
-                    Case "c_mailcontact" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtEmail.Text
+                    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 & ", " & usrCntl.datDatum.Value.ToString("dd-MM-yyyy")
+                    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

@@ -1790,7 +1798,7 @@ Public Class FormularManagerNEU
            End If

        Catch ex As Exception
-            MessageBox.Show(ex.ToString & ex.StackTrace)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
        End Try

        Return striList
@@ -1857,11 +1865,11 @@ Public Class FormularManagerNEU
                    Case "c_zipcode" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Ort
                    Case "c_vatno" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_UID
                    Case "c_phone" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Telefon & " " & FIRMA.Firma_Telefax
-                    Case "c_mailcontact" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtEmail.Text
+                    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 & ", " & usrCntl.datDatum.Value.ToString("dd-MM-yyyy")
+                    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