neu

2021-03-04 15:47:48 +01:00
parent 3aaf328ce6
commit b4612ab3e0
142 changed files with 24372 additions and 14785 deletions
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.vb
+++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.vb
@@ -208,10 +208,33 @@
            txtEustProzent.changeItem("0,19")
        End If

+        cboFirma.Items.Clear()
+
+        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+            Case "UNISPED"
+                cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED Speditions GmbH", "21"))
+                cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED Deutschland Speditions GmbH", "22"))
+                cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED Zollservice GmbH", "23"))
+                cboFirma.changeItem("22")
+
+            Case "IMEX"
+                cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX Customs Service GmbH", "20"))
+                cboFirma.changeItem("20")
+
+            Case "AMBAR"
+                cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "24"))
+                cboFirma.changeItem("24")
+
+                'Case "XXX"
+                '    cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG-UNISPED LTD", "26"))
+                '    cboFirma.changeItem("26")
+
+            Case Else
+                cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG Spedition AG", "1"))
+                cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG Customs Service GmbH", "11"))
+                cboFirma.changeItem("1")
+        End Select

-        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG Spedition AG", "AG"))
-        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG Customs Service GmbH", "CS"))
-        cboFirma.changeItem("AG")
        cboFiliale.fillWithSQL(" SELECT FilialenNr, Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", , "FMZOLL", True)

        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
@@ -237,14 +260,47 @@
    Private Sub MyTextBox1_TextChanged(sender As Object, e As EventArgs) Handles txtHerrFrau.TextChanged

    End Sub
-    Sub initBerechnung()
-        If txtUid.Text = "" Then
-            If txtMwstProzent._value = "" Then
-                txtMwstProzent._value = 0.2
-            End If
-        Else
-            txtMwstProzent._value = 0
+    Sub initSteuersatz()
+        Dim bool_steuerberechnung = True
+        If cboFirma._value <> "" Then
+            Dim FIRMA_TMP = New VERAG_PROG_ALLGEMEIN.cFirmen(cbofirma._value)
+            Select Case FIRMA_TMP.Firma_LandKz
+                Case "A", "AT"
+                    If txtUid.Text.Trim = "" OrElse txtUid.Text.ToUpper.StartsWith("AT") Then
+                        'If txtMwstProzent._value = "" Then
+                        txtMwstProzent._value = 0.2
+                        'End If
+                    Else
+                        txtMwstProzent._value = 0
+                        bool_steuerberechnung = False
+                    End If
+                Case Else '"D"
+                    If txtUid.Text.Trim = "" OrElse txtUid.Text.ToUpper.StartsWith("DE") Then
+                        'If txtMwstProzent._value = "" Then
+                        txtMwstProzent._value = 0.19
+                        ' End If
+                    Else
+                        txtMwstProzent._value = 0
+                        bool_steuerberechnung = False
+                    End If
+            End Select
        End If
+
+        If bool_steuerberechnung Then
+            txtMwstProzent.Visible = True
+            txtMWST.Visible = True
+            Label14.Visible = True
+        Else
+            txtMwstProzent.Visible = False
+            txtMWST.Visible = False
+            Label14.Visible = False
+            txtMWST.Visible = False
+        End If
+
+    End Sub
+
+    Sub initBerechnung()
+        initSteuersatz()
        '  MsgBox(lblRechnungsbetrag.Text)
        ' MsgBox(lblRechnungsbetrag._value)
        ' MsgBox(Vl(lblRechnungsbetrag))
@@ -302,31 +358,7 @@
    End Function

    Private Sub txtUid_TextChanged(sender As Object, e As EventArgs) Handles txtUid.TextChanged
-        Dim bool_steuerberechnung = True

-        If sender.text.trim = "" Then
-            bool_steuerberechnung = True
-        Else
-            bool_steuerberechnung = False
-            If sender.text.ToString.StartsWith("AT") Then
-                bool_steuerberechnung = True
-            End If
-        End If
-
-        If bool_steuerberechnung Then
-            txtMwstProzent.Visible = True
-            txtMWST.Visible = True
-            Label14.Visible = True
-            txtMwstProzent._value = "0,2"
-        Else
-            txtMwstProzent._value = "0"
-            txtMwstProzent.Visible = False
-            txtMWST.Visible = False
-            Label14.Visible = False
-        End If
-        txtMwstProzent.Visible = (sender.text.trim = "")
-        txtMWST.Visible = (sender.text.trim = "")
-        Label14.Visible = (sender.text.trim = "")
        initBerechnung()
    End Sub

@@ -339,19 +371,21 @@

    Private Sub MyComboBox2_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboFirma.SelectedIndexChanged
        If txtEustProzent._value <> "0" Then ' Wenn =, soll das bleiben
+            'Dim FIRMA_TMP = New VERAG_PROG_ALLGEMEIN.cFirmen(cboFiliale._value)
+            'Select Case FIRMA_TMP.Firma_LandKz
            Select Case cboFirma._value
-                Case "CS"
+                Case "11" ', "21", "23"
                    txtEustProzent.changeItem("0,20")
-                Case "AG"
-                    If CDate(Now.ToShortDateString) >= CDate("01.07.2020") And CDate(Now.ToShortDateString) <= CDate("20.12.2020") Then
-                        txtEustProzent.changeItem("0,16")
-                    Else
-                        txtEustProzent.changeItem("0,19")
-                    End If
-
-
+                Case Else
+                    'If CDate(Now.ToShortDateString) >= CDate("01.07.2020") And CDate(Now.ToShortDateString) <= CDate("20.12.2020") Then
+                    '    txtEustProzent.changeItem("0,16")
+                    'Else
+                    '    txtEustProzent.changeItem("0,19")
+                    'End If
+                    txtEustProzent.changeItem("0,19")
            End Select
        End If
+        initBerechnung()
    End Sub

    Private Sub pnlBottom_Paint(sender As Object, e As PaintEventArgs) Handles pnlBottom.Paint
--- a/SDL/Formulare/KDFormulare/frmFormulare.vb
+++ b/SDL/Formulare/KDFormulare/frmFormulare.vb
@@ -228,6 +228,25 @@ Public Class frmFormulare
                cboVorlage.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Neukunde AT Fiskal", FormularVorlagenGruppe.NeukundeATFiskal_IMEX))

            Case "ATILLA"
+            Case "AMBAR"
+                MyListBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DE Vollmacht", FormularManagerArten.DE_Vollmacht))
+                MyListBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Export Vollmacht", FormularManagerArten.VERAG_EXPORT))
+                MyListBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VUB (VERAG Spedition AG)", FormularManagerArten.VUB_AG))
+                MyListBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Importaviso Vorauskasse", FormularManagerArten.Importaviso_VK))
+                MyListBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Gestellungsgarantie", FormularManagerArten.Gestellungsgarantie))
+                MyListBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollungspreise", FormularManagerArten.Verzollungspreise))
+
+                MyListBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Dispoliste", FormularManagerArten.DispoListe))
+                MyListBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SA_Gestellung", FormularManagerArten.SA_Gestellung))
+
+                MyListBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EORI-Antrag", FormularManagerArten.EORI_Antrag))
+
+                MyListBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verbundenheit Käufer/Verkäufer", FormularManagerArten.Verbundenheit))
+
+                cboVorlage.Items.Clear()
+                cboVorlage.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
+                cboVorlage.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Neukunde DE", FormularVorlagenGruppe.NeukundeDE))
+
            Case Else
                MyListBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DE Vollmacht", FormularManagerArten.DE_Vollmacht))
                MyListBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DE Fiskal-Vollmacht", FormularManagerArten.DE_Fiskal))
@@ -1307,9 +1326,10 @@ Public Class FormularManagerNEU
        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEmail.Text, 40, 80, 90, 6, "bold", 8, , iTextSharp.text.Element.ALIGN_LEFT))

        Dim top = 0
-        If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Then
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
            top = 25
        End If
+
        If usrCntl.cbxEinmaligeVollmacht.Checked Then
            listTowrite = addEinmaligeVM(listTowrite, 0, top + 200, usrCntl.cboSprache._value, usrCntl.txtEinmalig_RgNr.Text, usrCntl.txtEinmalig_RgDat.Text)
        ElseIf usrCntl.cbxEinmaligeVollmachtCarnetATA.Checked Then
@@ -3051,7 +3071,7 @@ Public Class FormularManagerNEU


        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
-            Case "IMEX"
+            Case "IMEX", "AMBAR", "UNISPED"
                Select Case usrCntl.cboSprache._value
                    Case "EN"
                        Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "VOLLMACHTEN", getUO2, "", "VM_EXPORT_EN", listTowrite)
@@ -3176,7 +3196,7 @@ Public Class FormularManagerNEU
            Case Else

                Select Case usrCntl.cboFirma._value
-                    Case "CS" : destPath = fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "Importaviso_CS_NEU2", listTowrite)
+                    Case "11" : destPath = fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "Importaviso_CS_NEU2", listTowrite)
                    Case Else : destPath = fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "Importaviso_AG_NEU2", listTowrite)
                End Select