neu

2021-02-02 21:19:23 +01:00
parent 595851ec3c
commit 3aaf328ce6
16 changed files with 59 additions and 33 deletions
--- a/SDL/kunden/Berichte/rptKundeUebersicht.vb
+++ b/SDL/kunden/Berichte/rptKundeUebersicht.vb
@@ -37,6 +37,7 @@ Public Class rptKundeUebersicht
        Select Case Firma
            Case "IMEX" : Me.picVERAG.Image = My.Resources.IMEX_LOGO_simple : Me.Label28.Text = "IMEX Customs Service GmbH"
            Case "ATILLA" : Me.picVERAG.Image = My.Resources.Atilla : Me.Label28.Text = "ATILLA Spedition"
+            Case "UNISPED" : Me.picVERAG.Image = My.Resources.Unisped_logo : Me.Label28.Text = "UNISPED Speditions GmbH"
            Case Else
        End Select

--- a/SDL/kunden/frmKundenUebersichtZOLL.vb
+++ b/SDL/kunden/frmKundenUebersichtZOLL.vb
@@ -112,15 +112,31 @@ Public Class frmKundenUebersichtZOLL
            Case 99 : Me.Close() : Exit Sub
        End Select

-        'End If
        cboKundenblattFirma.Items.Clear()
-        cboKundenblattFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG (alle)", "1,11,15"))
-        cboKundenblattFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG (AG)", "1"))
-        cboKundenblattFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG (CS)", "11"))
-        cboKundenblattFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "7"))
-        cboKundenblattFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG + ATILLA", "1,11,15,7"))
-        cboKundenblattFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "20"))
-        cboKundenblattFirma.SelectedIndex = 0
+        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+            Case "IMEX"
+                cboKundenblattFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "20"))
+                cboKundenblattFirma.SelectedIndex = 0
+            Case "UNISPED"
+                cboKundenblattFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "21,22,23"))
+                cboKundenblattFirma.SelectedIndex = 0
+            Case "ATILLA"
+                cboKundenblattFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "7"))
+                cboKundenblattFirma.SelectedIndex = 0
+            Case "AMBAR"
+                cboKundenblattFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "24"))
+                cboKundenblattFirma.SelectedIndex = 0
+            Case "VERAG"
+                cboKundenblattFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG (alle)", "1,11,15"))
+                cboKundenblattFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG (AG)", "1"))
+                cboKundenblattFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG (CS)", "11"))
+                cboKundenblattFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "7"))
+                cboKundenblattFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG + ATILLA", "1,11,15,7"))
+                cboKundenblattFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "20"))
+                cboKundenblattFirma.SelectedIndex = 0
+            Case Else
+                '
+        End Select

        KdSearchBox1.initKdBox(Me) ', lblKdNr)

@@ -1166,6 +1182,7 @@ Public Class frmKundenUebersichtZOLL
        Select Case cboKundenblattFirma._value
            Case "7" : Firma = "ATILLA"
            Case "20" : Firma = "IMEX"
+            Case "21,22,23" : Firma = "UNISPED"
        End Select


--- a/SDL/kunden/frmKundenblatt.Designer.vb
+++ b/SDL/kunden/frmKundenblatt.Designer.vb
@@ -1203,7 +1203,7 @@ Partial Class frmKundenblatt
        Me.tbSDLKarten.Location = New System.Drawing.Point(4, 22)
        Me.tbSDLKarten.Name = "tbSDLKarten"
        Me.tbSDLKarten.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbSDLKarten.Size = New System.Drawing.Size(178, 39)
+        Me.tbSDLKarten.Size = New System.Drawing.Size(1162, 588)
        Me.tbSDLKarten.TabIndex = 7
        Me.tbSDLKarten.Text = "SDL-Kartenverwaltung"
        Me.tbSDLKarten.UseVisualStyleBackColor = True
@@ -1215,7 +1215,7 @@ Partial Class frmKundenblatt
        Me.usrcntlKarten.Location = New System.Drawing.Point(3, 3)
        Me.usrcntlKarten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.usrcntlKarten.Name = "usrcntlKarten"
-        Me.usrcntlKarten.Size = New System.Drawing.Size(172, 33)
+        Me.usrcntlKarten.Size = New System.Drawing.Size(1156, 582)
        Me.usrcntlKarten.TabIndex = 0
        '
        'tbLKW
--- a/SDL/kunden/frmNeuerKunde.vb
+++ b/SDL/kunden/frmNeuerKunde.vb
@@ -30,6 +30,7 @@
                ComboBox1.changeItem("5701")
            Case "ATILLA"
                ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  100000-199999: ATILLA", "100000-199999"))
+                ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  800000-899999: BREXIT", "800000-899999"))
                ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  900000-999999: Sonstige", "900000-999999"))
                'ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  700000-799999: ZOLL Abrechnung", "728000-799999"))
                ' ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  900000-999999: Sonstige", "900000-999999"))
@@ -49,6 +50,7 @@
                ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  700000-799999: ZOLL Abrechnung", "728000-799999"))
                ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  5-stellig: Fiskal (keine Abrechnung)", "30000-49999"))
                '  ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  800000-899999: XXXXXX", "800000-899999"))
+                ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  800000-899999: BREXIT", "800000-899999"))
                ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  900000-999999: Sonstige", "900000-999999"))
                ' ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("1000000-1099999: IMEX", "1000000-1099990"))
                ComboBox2.changeItem("728000-799999")
--- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb
+++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb
@@ -61,6 +61,7 @@ Public Class usrcntlKundeBearbeitenFull
                cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  500000-599999: EV - Kunden", "500000-599999"))
                cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  700000-799999: ZOLL Abrechnung", "728000-799999"))
                cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  5-stellig: Fiskal (keine Abrechnung)", "30000-49999"))
+                cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  800000-899999: BREXIT", "800000-899999"))
                cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  900000-999999: Sonstige", "900000-999999"))
                cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("1000000-1099999: IMEX", "1000000-1099990"))

@@ -92,6 +93,7 @@ Public Class usrcntlKundeBearbeitenFull
                        cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  700000-799999: ZOLL Abrechnung", "728000-799999"))
                        cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  5-stellig: Fiskal (keine Abrechnung)", "30000-49999"))
                        '  ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  800000-899999: XXXXXX", "800000-899999"))
+                        cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  800000-899999: BREXIT", "800000-899999"))
                        cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  900000-999999: Sonstige", "900000-999999"))
                        ' ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("1000000-1099999: IMEX", "1000000-1099990"))
                        cboKundenkreis.changeItem("728000-799999")
@@ -1131,6 +1133,7 @@ Public Class usrcntlKundeBearbeitenFull
                Case "30000-49999" : cbxFiBu.Checked = True : cboFirma.changeItem("11") : cboFiliale.changeItem("4803")
                Case "500000-599999" : cbxFiBu.Checked = True : cboFirma.changeItem("1") : cboFiliale.changeItem("4803")
                Case "900000-999999" : cbxFiBu.Checked = False : cboFirma.changeItem("1") : cboFiliale.changeItem("4803")
+                Case "800000-899999" : cbxFiBu.Checked = False : cboFirma.changeItem("1") : cboFiliale.changeItem("4803")
                Case "100000-199999" : cbxFiBu.Checked = False : cboFirma.changeItem("1") : cboFiliale.changeItem("4803")
                Case "9900000-9999999" : cbxFiBu.Checked = False : cboFirma.changeItem("17") : cboFiliale.changeItem("5801")