Fakt, MDM-Formulare, Spedbuchsuche

SDL/Fakturierung/cFakturierung.vb

@@ -1549,8 +1549,8 @@ Public Class cFakturierung
 
             If RECHNUNG.Firma_ID = 19 Then
 
-                rpt.lblSteuersatz.Visible = False
+                'rpt.lblSteuersatz.Visible = False
-                rpt.lblSteuerbetrag.Visible = False
+                'rpt.lblSteuerbetrag.Visible = False
                 rpt.lblSteuerpflichtigGes.Visible = False
                 rpt.lblSteuerfreiGes.Visible = False
                 rpt.lblZwText.Visible = False
@@ -1716,8 +1716,8 @@ Public Class cFakturierung
 
                                                      If RECHNUNG.Firma_ID = 19 Then
 
-                                                         rpt.lblSteuersatz.Visible = False
+                                                         'rpt.lblSteuersatz.Visible = False
-                                                         rpt.lblSteuerbetrag.Visible = False
+                                                         'rpt.lblSteuerbetrag.Visible = False
                                                          rpt.lblSteuerpflichtigGes.Visible = False
                                                          rpt.lblSteuerfreiGes.Visible = False
                                                          rpt.lblZwText.Visible = False

SDL/Fakturierung/usrCntlFaktAbrechnung.vb

@@ -1976,11 +1976,7 @@ Public Class usrCntlFaktAbrechnung
                         Select Case SPEDBUCH.Abfertigungsart
                             Case "26", "27", "38"
                                 If If(RECHNUNG.Anlage_1, String.Empty) = String.Empty Then RECHNUNG.Anlage_1 = "Zollbelege"
-                            Case "5", "6"
+                            Case "5", "6", "7", "10", "19", "30", "33", "34", "35", "36", "37", "42", "44", "53", "54", "55", "65", "67", "68", "69"
-                                If If(RECHNUNG.Anlage_1, String.Empty) = String.Empty Then RECHNUNG.Anlage_1 = ""
-                            Case "7"
-                                If If(RECHNUNG.Anlage_1, String.Empty) = String.Empty Then RECHNUNG.Anlage_1 = ""
-                            Case "19"
                                 If If(RECHNUNG.Anlage_1, String.Empty) = String.Empty Then RECHNUNG.Anlage_1 = ""
                             Case "9" 'Leihgeld
                                 If If(RECHNUNG.Anlage_1, String.Empty) = String.Empty Then RECHNUNG.Anlage_1 = "Auszahlungsquittung"

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

@@ -1005,7 +1005,7 @@ Partial Class usrcntlVollmacht_MDM_EU
         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.Location = New System.Drawing.Point(423, 236)
         Me.txt_GF_nachname.MaxLineLength = -1
         Me.txt_GF_nachname.MaxLines_Warning = ""
         Me.txt_GF_nachname.MaxLines_Warning_Label = Nothing
@@ -1028,7 +1028,7 @@ Partial Class usrcntlVollmacht_MDM_EU
         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.Location = New System.Drawing.Point(254, 236)
         Me.txt_GF_vorname.MaxLineLength = -1
         Me.txt_GF_vorname.MaxLines_Warning = ""
         Me.txt_GF_vorname.MaxLines_Warning_Label = Nothing
@@ -1077,7 +1077,7 @@ Partial Class usrcntlVollmacht_MDM_EU
         Me.txtAnzahlAusdrucke._ShortDateOnly = False
         Me.txtAnzahlAusdrucke._TimeOnly = False
         Me.txtAnzahlAusdrucke._TimeOnly_Seconds = False
-        Me.txtAnzahlAusdrucke._value = Nothing
+        Me.txtAnzahlAusdrucke._value = ""
         Me.txtAnzahlAusdrucke._Waehrung = False
         Me.txtAnzahlAusdrucke._WaehrungZeichen = True
         Me.txtAnzahlAusdrucke.ForeColor = System.Drawing.Color.Black

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

@@ -504,7 +504,7 @@ Partial Class usrcntlVollmacht_MDM_NICHT_EU
         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, 222)
+        Me.txt_GF_nachname.Location = New System.Drawing.Point(402, 222)
         Me.txt_GF_nachname.MaxLineLength = -1
         Me.txt_GF_nachname.MaxLines_Warning = ""
         Me.txt_GF_nachname.MaxLines_Warning_Label = Nothing
@@ -715,7 +715,7 @@ Partial Class usrcntlVollmacht_MDM_NICHT_EU
         Me.txtGruendungsdat._Waehrung = False
         Me.txtGruendungsdat._WaehrungZeichen = False
         Me.txtGruendungsdat.ForeColor = System.Drawing.Color.Black
-        Me.txtGruendungsdat.Location = New System.Drawing.Point(255, 188)
+        Me.txtGruendungsdat.Location = New System.Drawing.Point(255, 187)
         Me.txtGruendungsdat.MaxLength = 10
         Me.txtGruendungsdat.MaxLineLength = -1
         Me.txtGruendungsdat.MaxLines_Warning = ""
@@ -995,12 +995,12 @@ Partial Class usrcntlVollmacht_MDM_NICHT_EU
         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, 222)
+        Me.txt_GF_vorname.Location = New System.Drawing.Point(253, 222)
         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.Size = New System.Drawing.Size(147, 20)
         Me.txt_GF_vorname.TabIndex = 144
         '
         'cbxPrintDateAndCity

SDL/Formulare/KDFormulare/frmFormulare.vb

@@ -10,6 +10,7 @@ Imports System.Windows.Documents
 Imports VERAG_PROG_ALLGEMEIN
 Imports com.sun.tools.internal.ws.wsdl.document.mime
 Imports com.sun.xml.internal.ws.message.stream
+Imports com.sun.org.apache.xerces.internal.xs
 
 Public Class frmFormulare
     Dim isSingleForm = False
@@ -1616,15 +1617,13 @@ Public Class FormularManagerNEU
         Dim Top = -10
         Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues)
 
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAnsprechpartner.Text, 140, Top + 30, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAnsprechpartner.Text, 140, Top + 30, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
-
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFirma.Text, 40, Top + 50, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFirma.Text, 40, top + 50, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse1.Text, 40, Top + 56, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse1.Text, 40, top + 56, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse2.Text, 40, Top + 62, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse2.Text, 40, top + 62, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtTel.Text, 40, Top + 70, 55, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
-
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEmail.Text, 120, Top + 70, 90, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtTel.Text, 40, Top + 70, 55, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtDauer.Text, 40, Top + 78, 90, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEmail.Text, 120, Top + 70, 90, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtDauer.Text, 40, Top + 78, 90, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))
 
 
 
@@ -1646,17 +1645,15 @@ Public Class FormularManagerNEU
 
         Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues)
 
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAnsprechpartner.Text, 128, 36, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAnsprechpartner.Text, 128, 36, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
-
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFirma.Text, 40, 50, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFirma.Text, 40, 50, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse1.Text, 40, 56, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse1.Text, 40, 56, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse2.Text, 40, 62, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse2.Text, 40, 62, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtUid.Text, 40, 68, 55, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
-
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEori.Text, 119, 68, 70, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtUid.Text, 40, 68, 55, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtTel.Text, 40, 74, 55, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEori.Text, 119, 68, 70, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFax.Text, 119, 74, 70, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtTel.Text, 40, 74, 55, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEmail.Text, 40, 81, 90, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFax.Text, 119, 74, 70, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEmail.Text, 40, 81, 90, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))
 
         Dim top = 0
         If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
@@ -1724,6 +1721,10 @@ Public Class FormularManagerNEU
     Shared Function VM_MDM_BHI(usrCntl As usrcntlVollmacht_MDM_BHI) As String
         Try
 
+            If usrCntl.cboLand._value = "" Then
+                MsgBox("Bitte Land auswählen!")
+                Return ""
+            End If
 
             'aktuell nur als PDF
 
@@ -1788,6 +1789,11 @@ Public Class FormularManagerNEU
     Shared Function VM_MDM_NICHT_EU(usrCntl As usrcntlVollmacht_MDM_NICHT_EU, Optional printReportElsePDF As Boolean = False, Optional printername As String = "", Optional openWord As Boolean = False) As List(Of String)
         Dim striList As New List(Of String)
 
+        If usrCntl.cboLand._value = "" Then
+            MsgBox("Bitte Land auswählen!")
+            Return striList
+        End If
+
 
         Try
 
@@ -1836,7 +1842,7 @@ Public Class FormularManagerNEU
                         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 "surname_firstname" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_vorname.Text & " " & usrCntl.txt_GF_nachname.Text)) 'bewusst vor- und nachname vertauscht!!!
                         Case "firstname_surname" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_vorname.Text & " " & usrCntl.txt_GF_nachname.Text))
 
                         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
@@ -1993,7 +1999,7 @@ Public Class FormularManagerNEU
                         Case "street2" : 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_vorname.Text <> "", usrCntl.txt_GF_vorname.Text & " ", " ") & IIf(usrCntl.txt_GF_nachname.Text <> "", usrCntl.txt_GF_nachname.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, "") 'bewusst vor- und nachname vertauscht!!!
                         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
@@ -2121,6 +2127,10 @@ Public Class FormularManagerNEU
     Shared Function VM_MDM_EU(usrCntl As usrcntlVollmacht_MDM_EU, Optional printReportElsePDF As Boolean = False, Optional printername As String = "", Optional openWord As Boolean = False) As List(Of String)
         Dim striList As New List(Of String)
 
+        If usrCntl.cboLand._value = "" Then
+            MsgBox("Bitte Land auswählen!")
+            Return striList
+        End If
 
         Try
 
@@ -2161,7 +2171,7 @@ 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_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 & " ", " ") 'bewusst vor- und nachname vertauscht!!!
                     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
@@ -2207,15 +2217,14 @@ Public Class FormularManagerNEU
 
                 For Each item In odoc.FormFields
 
-                Dim fieldName = item.Name.ToLower().Trim()
+                    Dim fieldName = item.Name.ToLower().Trim()
-
+                    Select Case fieldName
-                Select Case fieldName
                         Case "bank" : odoc.FormFields(fieldName).Range.Text = IIf((Not IsDBNull(dtKundenBank.Rows(0).Item("bnk_anschrift")) AndAlso dtKundenBank.Rows(0).Item("bnk_anschrift") IsNot Nothing), dtKundenBank.Rows(0).Item("bnk_anschrift"), "")
                         Case "iban" : odoc.FormFields(fieldName).Range.Text = IIf((Not IsDBNull(dtKundenBank.Rows(0).Item("bnk_iban")) AndAlso dtKundenBank.Rows(0).Item("bnk_iban") IsNot Nothing), dtKundenBank.Rows(0).Item("bnk_iban"), "")
                         Case "bic" : odoc.FormFields(fieldName).Range.Text = IIf((Not IsDBNull(dtKundenBank.Rows(0).Item("bnk_bic")) AndAlso dtKundenBank.Rows(0).Item("bnk_bic") IsNot Nothing), dtKundenBank.Rows(0).Item("bnk_bic"), "")
                         Case "name1" : odoc.FormFields(fieldName).Range.Text = IIf(dtKundenBank.Rows.Count = 1, usrCntl.txtFirma.Text, "")
-                End Select
+                    End Select
-            Next
+                Next
 
             End If
 

SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb

@@ -2190,6 +2190,15 @@ Public Class usrCntlSpeditionsBuchSuche
                                 Blatt.Range("I" & cnt).Value = ZOLLANMELDUNG.ABGABEN_ZOLL
                                 Blatt.Range("J" & cnt).Value = ZOLLANMELDUNG.ANZ_POS
 
+
+                                '----------------------------------NEW
+
+                                Blatt.Range("K" & cnt).Value = ZOLLANMELDUNG.Anmelder
+                                Blatt.Range("L" & cnt).Value = ZOLLANMELDUNG.Warenbezeichung
+                                Blatt.Range("M" & cnt).Value = ZOLLANMELDUNG.VerBestLandZst
+                                '----------------------------------
+
+
                                 If If(ZOLLANMELDUNG.ATCMRN, "") <> "" Then
                                     Blatt.Range("H" & cnt).Value = ZOLLANMELDUNG.ATCMRN
                                 End If