neu

2020-05-31 22:25:35 +02:00
parent 4a358d43fd
commit 083e666fbc
214 changed files with 14292 additions and 4117 deletions
--- a/SDL/kunden/Vorauskasse/frmVorauskasse.Designer.vb
+++ b/SDL/kunden/Vorauskasse/frmVorauskasse.Designer.vb
@@ -25,6 +25,7 @@ Partial Class frmVorauskasse
        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmVorauskasse))
        Me.pnl = New System.Windows.Forms.Panel()
+        Me.cbxLKWAnkunft = New System.Windows.Forms.CheckBox()
        Me.txtBetrag = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.Label7 = New System.Windows.Forms.Label()
        Me.txtFirma = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -46,6 +47,7 @@ Partial Class frmVorauskasse
        Me.Label23 = New System.Windows.Forms.Label()
        Me.btnJahr = New System.Windows.Forms.Button()
        Me.pnlTop = New System.Windows.Forms.Panel()
+        Me.btnVK_VERAG_VR = New System.Windows.Forms.Button()
        Me.Label4 = New System.Windows.Forms.Label()
        Me.btnBisJahr = New System.Windows.Forms.Button()
        Me.btnVonJahr = New System.Windows.Forms.Button()
@@ -90,6 +92,7 @@ Partial Class frmVorauskasse
        '
        Me.pnl.BackColor = System.Drawing.Color.WhiteSmoke
        Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.pnl.Controls.Add(Me.cbxLKWAnkunft)
        Me.pnl.Controls.Add(Me.txtBetrag)
        Me.pnl.Controls.Add(Me.Label7)
        Me.pnl.Controls.Add(Me.txtFirma)
@@ -129,6 +132,16 @@ Partial Class frmVorauskasse
        Me.pnl.Size = New System.Drawing.Size(1199, 162)
        Me.pnl.TabIndex = 0
        '
+        'cbxLKWAnkunft
+        '
+        Me.cbxLKWAnkunft.AutoSize = True
+        Me.cbxLKWAnkunft.Location = New System.Drawing.Point(923, 131)
+        Me.cbxLKWAnkunft.Name = "cbxLKWAnkunft"
+        Me.cbxLKWAnkunft.Size = New System.Drawing.Size(151, 17)
+        Me.cbxLKWAnkunft.TabIndex = 71
+        Me.cbxLKWAnkunft.Text = "LKW auf Status ""Ankunft"""
+        Me.cbxLKWAnkunft.UseVisualStyleBackColor = True
+        '
        'txtBetrag
        '
        Me.txtBetrag._DateTimeOnly = False
@@ -148,7 +161,7 @@ Partial Class frmVorauskasse
        Me.txtBetrag.MaxLines_Warning = ""
        Me.txtBetrag.MaxLines_Warning_Label = Nothing
        Me.txtBetrag.Name = "txtBetrag"
-        Me.txtBetrag.Size = New System.Drawing.Size(137, 20)
+        Me.txtBetrag.Size = New System.Drawing.Size(135, 20)
        Me.txtBetrag.TabIndex = 70
        Me.txtBetrag.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
        '
@@ -437,6 +450,7 @@ Partial Class frmVorauskasse
        'pnlTop
        '
        Me.pnlTop.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.pnlTop.Controls.Add(Me.btnVK_VERAG_VR)
        Me.pnlTop.Controls.Add(Me.Label4)
        Me.pnlTop.Dock = System.Windows.Forms.DockStyle.Top
        Me.pnlTop.Location = New System.Drawing.Point(0, 0)
@@ -444,6 +458,22 @@ Partial Class frmVorauskasse
        Me.pnlTop.Size = New System.Drawing.Size(1197, 48)
        Me.pnlTop.TabIndex = 34
        '
+        'btnVK_VERAG_VR
+        '
+        Me.btnVK_VERAG_VR.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.btnVK_VERAG_VR.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnVK_VERAG_VR.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
+        Me.btnVK_VERAG_VR.ForeColor = System.Drawing.Color.White
+        Me.btnVK_VERAG_VR.Image = Global.SDL.My.Resources.Resources.moneybag1
+        Me.btnVK_VERAG_VR.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnVK_VERAG_VR.Location = New System.Drawing.Point(900, 3)
+        Me.btnVK_VERAG_VR.Name = "btnVK_VERAG_VR"
+        Me.btnVK_VERAG_VR.Size = New System.Drawing.Size(185, 42)
+        Me.btnVK_VERAG_VR.TabIndex = 71
+        Me.btnVK_VERAG_VR.Text = "VK Konto VERAG" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "VR-Bank Passau"
+        Me.btnVK_VERAG_VR.UseVisualStyleBackColor = False
+        Me.btnVK_VERAG_VR.Visible = False
+        '
        'Label4
        '
        Me.Label4.AutoSize = True
@@ -961,4 +991,6 @@ Partial Class frmVorauskasse
    Friend WithEvents Label8 As System.Windows.Forms.Label
    Friend WithEvents btnDel As System.Windows.Forms.Button
    Friend WithEvents Button4 As Button
+    Friend WithEvents btnVK_VERAG_VR As Button
+    Friend WithEvents cbxLKWAnkunft As CheckBox
 End Class
--- a/SDL/kunden/Vorauskasse/frmVorauskasse.vb
+++ b/SDL/kunden/Vorauskasse/frmVorauskasse.vb
@@ -78,6 +78,10 @@
            btnDel.Visible = True
        End If

+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VORAUSKASSE_Bank_Login_VERAG", Me) Then
+            btnVK_VERAG_VR.Visible = True
+        End If
+

    End Sub

@@ -131,22 +135,46 @@
    End Sub


-    Private Sub btnSuche_Click(sender As Object, e As EventArgs) Handles btnSuche.Click
+    Private Sub btnSuche_Click(sender As Object, e As EventArgs) Handles btnSuche.Click, cbxLKWAnkunft.CheckedChanged
+
+        'If sender Is cbxLKWAnkunft Then
+        '    If vbYes = MsgBox("Achtung - komplexe Abfrage: ", vbYesNoCancel) Then
+        'End If
+        If cbxLKWAnkunft.Checked Then
+            txtMaxSrch.Text = 50
+            txtAbfertDat.Enabled = False
+            txtAbfertDatBis.Enabled = False
+            DateTimePicker1.Enabled = False
+            DateTimePicker2.Enabled = False
+        Else
+            txtAbfertDat.Enabled = True
+            txtAbfertDatBis.Enabled = True
+            DateTimePicker1.Enabled = True
+            DateTimePicker2.Enabled = True
+        End If
+
        Me.Cursor = Cursors.WaitCursor

        Dim TopMax = If(IsNumeric(txtMaxSrch.Text), " TOP " & txtMaxSrch.Text, "")
        Dim sqlstr As String = ""
+        Dim LKWAnkunft = " WHERE 1=1   "
+        If cbxLKWAnkunft.Checked Then
+            '  LKWAnkunft = " , (SELECT TOP 1 Count(*) FROM " & VERAG_PROG_ALLGEMEIN.cAllgemein.AVISO_SERVER & ".AVISO.dbo.AVISO INNER JOIN " & VERAG_PROG_ALLGEMEIN.cAllgemein.AVISO_SERVER & ".AVISO.dbo.tblSendungen  on AVISO.AvisoId=tblSendungen.tblSnd_AvisoID where Status=1 and FilialenNr=[vk_FilialeNr] and AbfertigungsNr=[vk_AbfertigungsNr] ) LKW_Ankunft "
+            'LKWAnkunft = "  and  (SELECT TOP 1 Count(*) FROM " & VERAG_PROG_ALLGEMEIN.cAllgemein.AVISO_SERVER & ".AVISO.dbo.AVISO INNER JOIN " & VERAG_PROG_ALLGEMEIN.cAllgemein.AVISO_SERVER & ".AVISO.dbo.tblSendungen  on AVISO.AvisoId=tblSendungen.tblSnd_AvisoID where Status=" & VERAG_PROG_ALLGEMEIN.cGlobal.Status_Ankunft & " and FilialenNr=[vk_FilialeNr] and AbfertigungsNr=[vk_AbfertigungsNr] ) >0 "
+            LKWAnkunft = " inner join " & VERAG_PROG_ALLGEMEIN.cAllgemein.AVISO_SERVER & ".AVISO.dbo.tblSendungen on FilialenNr=[vk_FilialeNr] and AbfertigungsNr=[vk_AbfertigungsNr]  inner join " & VERAG_PROG_ALLGEMEIN.cAllgemein.AVISO_SERVER & ".AVISO.dbo.AVISO  on AVISO.AvisoId=tblSendungen.tblSnd_AvisoID   WHERE 1=1  and Status=3 "
+        End If

+        'sqlstr &= " SELECT " & TopMax & " [vk_id],[vk_FilialeNr],[vk_AbfertigungsNr],[vk_Datum],[vk_LKW],[vk_KdNr],[vk_Firma],[vk_QS_Sachbearbeiter],[vk_QS_Bemerkung],vk_Betrag,[vk_GeldEingetroffen],[vk_BH_Sachbearbeiter],[vk_BH_Bemerkung],[vk_BH_DatumGeldeingang],vk_storno,vk_Freigegeben " & LKWAnkunft & " FROM tblVorauskassen  WHERE 1=1 "
+        sqlstr &= " SELECT " & TopMax & " [vk_id],[vk_FilialeNr],[vk_AbfertigungsNr],[vk_Datum],[vk_LKW],[vk_KdNr],[vk_Firma],[vk_QS_Sachbearbeiter],[vk_QS_Bemerkung],vk_Betrag,[vk_GeldEingetroffen],[vk_BH_Sachbearbeiter],[vk_BH_Bemerkung],[vk_BH_DatumGeldeingang],vk_storno,vk_Freigegeben  FROM tblVorauskassen  " & LKWAnkunft & " "

-        sqlstr &= " SELECT " & TopMax & " [vk_id],[vk_FilialeNr],[vk_AbfertigungsNr],[vk_Datum],[vk_LKW],[vk_KdNr],[vk_Firma],[vk_QS_Sachbearbeiter],[vk_QS_Bemerkung],vk_Betrag,[vk_GeldEingetroffen],[vk_BH_Sachbearbeiter],[vk_BH_Bemerkung],[vk_BH_DatumGeldeingang],vk_storno,vk_Freigegeben  FROM tblVorauskassen  WHERE 1=1 "
-
+        ' MsgBox(sqlstr & getVorauskasseWhere() & " ORDER BY vk_Datum desc ")
        With MyDatagridview1
            '  .DataSource = myTable
            .SET_SQL(sqlstr & getVorauskasseWhere() & " ORDER BY vk_Datum desc ", "FMZOLL", getVorauskasseList)
            .LOAD()
            setDGVOptions()
        End With
-            showDGV()
+        showDGV()

        Me.Cursor = Cursors.Default

@@ -156,11 +184,13 @@
    Function getVorauskasseWhere() As String
        Dim sqlstr = ""

-        If txtAbfertDat.Text <> "" Then
-            If txtAbfertDatBis.Text <> "" Then
-                sqlstr &= " AND ([vk_Datum] BETWEEN @Abfertigungsdatum AND @Abfertigungsdatum_bis ) "
-            Else
-                sqlstr &= " AND ([vk_Datum] BETWEEN @Abfertigungsdatum AND @Abfertigungsdatum ) "
+        If Not cbxLKWAnkunft.Checked Then
+            If txtAbfertDat.Text <> "" Then
+                If txtAbfertDatBis.Text <> "" Then
+                    sqlstr &= " AND ([vk_Datum] BETWEEN @Abfertigungsdatum AND @Abfertigungsdatum_bis ) "
+                Else
+                    sqlstr &= " AND ([vk_Datum] BETWEEN @Abfertigungsdatum AND @Abfertigungsdatum ) "
+                End If
            End If
        End If

@@ -186,10 +216,12 @@
    Function getVorauskasseList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)

        Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
-      
-        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Abfertigungsdatum", txtAbfertDat.Text & " 00:00:00"))
-        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Abfertigungsdatum_bis", txtAbfertDatBis.Text & " 23:59:59"))
-           list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("AbfertigungsNr", txtAbfertigungsnummer.Text.Replace("*", "%")))
+
+        If Not cbxLKWAnkunft.Checked Then
+            list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Abfertigungsdatum", txtAbfertDat.Text & " 00:00:00"))
+            list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Abfertigungsdatum_bis", txtAbfertDatBis.Text & " 23:59:59"))
+        End If
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("AbfertigungsNr", txtAbfertigungsnummer.Text.Replace("*", "%")))

        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FilialenNr", cboFiliale._value))

@@ -431,6 +463,50 @@

        End If
    End Sub
+
+    Private Sub Button8_Click(sender As Object, e As EventArgs) Handles btnVK_VERAG_VR.Click
+        Dim f As New frmInfo
+        f.Controls.Clear()
+        Dim f_EORI As Form
+        Dim WebBrowser As New VERAG_PROG_ALLGEMEIN.Kleinma.Controls.WebBrowserEx
+
+        f.Controls.Add(WebBrowser)
+        f.Visible = True
+        'f.Visible = false
+        'f.WindowState = FormWindowState.Minimized
+        f.Show()
+        f_EORI = f
+        WebBrowser.Dock = DockStyle.Fill
+        WebBrowser.Navigate(New Uri("https://www.vr-bank-passau.de/banking-business/entry"))
+        f.Size = New Size(1000, 1300)
+        f.StartPosition = FormStartPosition.CenterScreen
+        f.Top = 0
+        WebBrowser.AllowNavigation = True
+        Dim doFilling = True
+        Dim doFilling2 = False
+        WebBrowser.ScriptErrorsSuppressed = True
+        Dim cnt = 0
+        AddHandler WebBrowser.DocumentCompleted, Sub()
+                                                     cnt += 1
+                                                     If cnt > 1 Then Exit Sub
+                                                     ' Print the document now that it is fully loaded.
+                                                     If WebBrowser.ReadyState = WebBrowserReadyState.Complete Then
+
+                                                         Try
+
+                                                             WebBrowser.Document.GetElementById("txtBenutzerkennung").SetAttribute("value", "261016389")
+                                                             WebBrowser.Document.GetElementById("pwdPin").SetAttribute("value", "Frontoffice2020")
+
+                                                             WebBrowser.Document.GetElementById("xview-anmelden").InvokeMember("click")
+
+                                                         Catch ex As Exception
+
+                                                         End Try
+                                                     End If
+
+                                                 End Sub
+
+    End Sub
 End Class


--- a/SDL/kunden/frmKundenUebersichtZOLL.vb
+++ b/SDL/kunden/frmKundenUebersichtZOLL.vb
@@ -282,7 +282,9 @@ Public Class frmKundenUebersichtZOLL
        If (KdFirma <> VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA And Not VERAG_PROG_ALLGEMEIN.cAllgemein.isCLUSTER) And
            Not (KdFirma = "IMEX" And VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO")) Then

-            If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_CLUSTER", "SDL") Then
+            If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_CLUSTER", "SDL") And
+                Not ((KdFirma = "IMEX" Or KdFirma = "VERAG") And VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL")) And
+                Not ((KdFirma = "FRONTOFFICE") And VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_FRONTOFFICE", "SDL")) Then
                mnueOfferte.Enabled = False
                mnueRechnungen.Enabled = False
                mnueSpeditionsbuch.Enabled = False
--- a/SDL/kunden/frmKundenblatt.Designer.vb
+++ b/SDL/kunden/frmKundenblatt.Designer.vb
@@ -127,6 +127,8 @@ Partial Class frmKundenblatt
        Me.tbVERAGCard = New System.Windows.Forms.TabPage()
        Me.Panel3 = New System.Windows.Forms.Panel()
        Me.tbDokumente = New System.Windows.Forms.TabPage()
+        Me.Label7 = New System.Windows.Forms.Label()
+        Me.scanUebernahmebestätigungen = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
        Me.scanHKA = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
        Me.Label3 = New System.Windows.Forms.Label()
        Me.lblSonstigeDokumente = New System.Windows.Forms.Label()
@@ -162,8 +164,6 @@ Partial Class frmKundenblatt
        Me.tbiKartenverwaltung = New System.Windows.Forms.ToolStripMenuItem()
        Me.tbiLKW = New System.Windows.Forms.ToolStripMenuItem()
        Me.tbiVERAGCard = New System.Windows.Forms.ToolStripMenuItem()
-        Me.Label7 = New System.Windows.Forms.Label()
-        Me.scanUebernahmebestätigungen = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
        Me.pnlInfo.SuspendLayout()
        Me.tbFirmendaten.SuspendLayout()
        Me.Panel4.SuspendLayout()
@@ -1225,7 +1225,7 @@ Partial Class frmKundenblatt
        Me.tbLKW.Location = New System.Drawing.Point(4, 22)
        Me.tbLKW.Name = "tbLKW"
        Me.tbLKW.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbLKW.Size = New System.Drawing.Size(178, 39)
+        Me.tbLKW.Size = New System.Drawing.Size(1162, 588)
        Me.tbLKW.TabIndex = 4
        Me.tbLKW.Text = "LKWs"
        Me.tbLKW.UseVisualStyleBackColor = True
@@ -1237,7 +1237,7 @@ Partial Class frmKundenblatt
        Me.pnlLKWRight.Location = New System.Drawing.Point(309, 3)
        Me.pnlLKWRight.Name = "pnlLKWRight"
        Me.pnlLKWRight.Padding = New System.Windows.Forms.Padding(10, 0, 0, 0)
-        Me.pnlLKWRight.Size = New System.Drawing.Size(0, 33)
+        Me.pnlLKWRight.Size = New System.Drawing.Size(850, 582)
        Me.pnlLKWRight.TabIndex = 2
        '
        'UsrCntlLKW1
@@ -1250,7 +1250,7 @@ Partial Class frmKundenblatt
        Me.UsrCntlLKW1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.UsrCntlLKW1.MaximumSize = New System.Drawing.Size(1200, 1000)
        Me.UsrCntlLKW1.Name = "UsrCntlLKW1"
-        Me.UsrCntlLKW1.Size = New System.Drawing.Size(0, 33)
+        Me.UsrCntlLKW1.Size = New System.Drawing.Size(840, 582)
        Me.UsrCntlLKW1.TabIndex = 0
        '
        'pnlLKW
@@ -1261,7 +1261,7 @@ Partial Class frmKundenblatt
        Me.pnlLKW.Dock = System.Windows.Forms.DockStyle.Left
        Me.pnlLKW.Location = New System.Drawing.Point(3, 3)
        Me.pnlLKW.Name = "pnlLKW"
-        Me.pnlLKW.Size = New System.Drawing.Size(306, 33)
+        Me.pnlLKW.Size = New System.Drawing.Size(306, 582)
        Me.pnlLKW.TabIndex = 3
        '
        'dgvLKW
@@ -1278,7 +1278,7 @@ Partial Class frmKundenblatt
        Me.dgvLKW.ReadOnly = True
        Me.dgvLKW.RowHeadersVisible = False
        Me.dgvLKW.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvLKW.Size = New System.Drawing.Size(306, 0)
+        Me.dgvLKW.Size = New System.Drawing.Size(306, 408)
        Me.dgvLKW.TabIndex = 2
        '
        'pnlLKWBottom
@@ -1290,7 +1290,7 @@ Partial Class frmKundenblatt
        Me.pnlLKWBottom.Controls.Add(Me.Button13)
        Me.pnlLKWBottom.Controls.Add(Me.lblErgebnisse)
        Me.pnlLKWBottom.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.pnlLKWBottom.Location = New System.Drawing.Point(0, -79)
+        Me.pnlLKWBottom.Location = New System.Drawing.Point(0, 470)
        Me.pnlLKWBottom.Name = "pnlLKWBottom"
        Me.pnlLKWBottom.Size = New System.Drawing.Size(306, 112)
        Me.pnlLKWBottom.TabIndex = 3
@@ -1461,11 +1461,40 @@ Partial Class frmKundenblatt
        Me.tbDokumente.Controls.Add(Me.scanVertragVeragKd)
        Me.tbDokumente.Location = New System.Drawing.Point(4, 22)
        Me.tbDokumente.Name = "tbDokumente"
-        Me.tbDokumente.Size = New System.Drawing.Size(1162, 588)
+        Me.tbDokumente.Size = New System.Drawing.Size(178, 39)
        Me.tbDokumente.TabIndex = 8
        Me.tbDokumente.Text = "Dokumente"
        Me.tbDokumente.UseVisualStyleBackColor = True
        '
+        'Label7
+        '
+        Me.Label7.AutoSize = True
+        Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label7.Location = New System.Drawing.Point(488, 21)
+        Me.Label7.Name = "Label7"
+        Me.Label7.Size = New System.Drawing.Size(155, 13)
+        Me.Label7.TabIndex = 6
+        Me.Label7.Text = "Übernahmebestätigungen:"
+        '
+        'scanUebernahmebestätigungen
+        '
+        Me.scanUebernahmebestätigungen._DATENSERVER_KATEGORIE = "DOKUMENTE"
+        Me.scanUebernahmebestätigungen._DATENSERVER_ORDNER = "MDM"
+        Me.scanUebernahmebestätigungen._DATENSERVER_UOrdner1 = ""
+        Me.scanUebernahmebestätigungen._DATENSERVER_UOrdner2 = ""
+        Me.scanUebernahmebestätigungen._DATENSERVER_UOrdner3 = ""
+        Me.scanUebernahmebestätigungen._OPEN_ORIGINAL = False
+        Me.scanUebernahmebestätigungen._TYPE = "PDF"
+        Me.scanUebernahmebestätigungen.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+        Me.scanUebernahmebestätigungen.BackColor = System.Drawing.Color.White
+        Me.scanUebernahmebestätigungen.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.scanUebernahmebestätigungen.Cursor = System.Windows.Forms.Cursors.Default
+        Me.scanUebernahmebestätigungen.Location = New System.Drawing.Point(488, 40)
+        Me.scanUebernahmebestätigungen.Margin = New System.Windows.Forms.Padding(0)
+        Me.scanUebernahmebestätigungen.Name = "scanUebernahmebestätigungen"
+        Me.scanUebernahmebestätigungen.Size = New System.Drawing.Size(285, 505)
+        Me.scanUebernahmebestätigungen.TabIndex = 5
+        '
        'scanHKA
        '
        Me.scanHKA._ARCHIV = True
@@ -1788,7 +1817,6 @@ Partial Class frmKundenblatt
        '
        Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24)
        Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM"
-        Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4
        Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4)
        Me.cntxtCntxtMDM.Text = "cntxtMDM"
        '
@@ -1857,6 +1885,7 @@ Partial Class frmKundenblatt
        Me.KdSearchBox1._displayWoelflKd = False
        Me.KdSearchBox1._hideIfListEmpty = True
        Me.KdSearchBox1._loadKdData = False
+        Me.KdSearchBox1._UseFIRMA = ""
        Me.KdSearchBox1._ValueKdAndName = True
        Me.KdSearchBox1.BackColor = System.Drawing.Color.White
        Me.KdSearchBox1.dgvpos = "LEFT"
@@ -1901,35 +1930,6 @@ Partial Class frmKundenblatt
        Me.tbiVERAGCard.Size = New System.Drawing.Size(186, 22)
        Me.tbiVERAGCard.Text = "VERAG Card"
        '
-        'Label7
-        '
-        Me.Label7.AutoSize = True
-        Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label7.Location = New System.Drawing.Point(488, 21)
-        Me.Label7.Name = "Label7"
-        Me.Label7.Size = New System.Drawing.Size(155, 13)
-        Me.Label7.TabIndex = 6
-        Me.Label7.Text = "Übernahmebestätigungen:"
-        '
-        'scanUebernahmebestätigungen
-        '
-        Me.scanUebernahmebestätigungen._DATENSERVER_KATEGORIE = "DOKUMENTE"
-        Me.scanUebernahmebestätigungen._DATENSERVER_ORDNER = "MDM"
-        Me.scanUebernahmebestätigungen._DATENSERVER_UOrdner1 = ""
-        Me.scanUebernahmebestätigungen._DATENSERVER_UOrdner2 = ""
-        Me.scanUebernahmebestätigungen._DATENSERVER_UOrdner3 = ""
-        Me.scanUebernahmebestätigungen._OPEN_ORIGINAL = False
-        Me.scanUebernahmebestätigungen._TYPE = "PDF"
-        Me.scanUebernahmebestätigungen.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
-        Me.scanUebernahmebestätigungen.BackColor = System.Drawing.Color.White
-        Me.scanUebernahmebestätigungen.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.scanUebernahmebestätigungen.Cursor = System.Windows.Forms.Cursors.Default
-        Me.scanUebernahmebestätigungen.Location = New System.Drawing.Point(488, 40)
-        Me.scanUebernahmebestätigungen.Margin = New System.Windows.Forms.Padding(0)
-        Me.scanUebernahmebestätigungen.Name = "scanUebernahmebestätigungen"
-        Me.scanUebernahmebestätigungen.Size = New System.Drawing.Size(285, 505)
-        Me.scanUebernahmebestätigungen.TabIndex = 5
-        '
        'frmKundenblatt
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
--- a/SDL/kunden/frmKundenblatt.vb
+++ b/SDL/kunden/frmKundenblatt.vb
@@ -800,10 +800,11 @@ Public Class frmKundenblatt

            For Each r As DataGridViewRow In .Rows
                If (r.Cells("Verkauft").Value IsNot DBNull.Value AndAlso r.Cells("Verkauft").Value) Or
-                 (r.Cells("Abgemeldet").Value IsNot DBNull.Value AndAlso r.Cells("Abgemeldet").Value) Then
+                 (r.Cells("Abgemeldet").Value IsNot DBNull.Value AndAlso r.Cells("Abgemeldet").Value) Or
+                 (r.Cells("KZAenderung").Value IsNot DBNull.Value AndAlso r.Cells("KZAenderung").Value) Then
                    r.DefaultCellStyle.ForeColor = Color.Red
                End If
-                
+
            Next
        End With

--- a/SDL/kunden/frmLKWDetails.vb
+++ b/SDL/kunden/frmLKWDetails.vb
@@ -21,7 +21,7 @@

    End Sub
    Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click
-        txtKennzeichen.Text = txtKennzeichen.Text.ToUpper
+        txtKennzeichen.Text = txtKennzeichen.Text.ToUpper.Trim
        txtNationalitaet.Text = txtNationalitaet.Text.ToUpper
        Label5.ForeColor = Color.Black
        Label1.ForeColor = Color.Black
--- a/SDL/kunden/frmOffertenBearbeiten.vb
+++ b/SDL/kunden/frmOffertenBearbeiten.vb
@@ -1,5 +1,6 @@
 Public Class frmOffertenBearbeiten

+    Dim FIRMA_TMP = ""

    Public kdnr As Integer = -1
    Dim SQL As New SQL
@@ -16,9 +17,15 @@
    Private Sub frmOffertenBearbeiten_Load(sender As Object, e As EventArgs) Handles Me.Load
        FlowLayoutPanel.Controls.Clear()

+        Dim KUNDE As New VERAG_PROG_ALLGEMEIN.cKunde(kdnr)
+        If KUNDE Is Nothing Then Me.Close()
+        If Not KUNDE.hasEntry Then Me.Close()
+        FIRMA_TMP = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(KUNDE.FilialenNr)
+
+
        'Dim OFFERTE As New cOfferteList(kdnr, False)
        Dim where = ""
-        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+        Select Case FIRMA_TMP
            Case "IMEX"
                where = " WHERE [Offertenstamm].[OffertenNr] IN (1,2,3,4,5,6,7,8,9,10,26,27,29)"
        End Select
@@ -50,7 +57,7 @@
                    o.SAVE() 'speichern
                    o.LOAD_POSITIONEN() 'positionen Laden
                    If o.POSITIONEN.Count = 0 Then 'wenn keine POS --> neues Offert
-                        o.RESET_STANDARTOFFERTEN_FIRMA(VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) '--> Standartofferten laden
+                        o.RESET_STANDARTOFFERTEN_FIRMA(VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME, FIRMA_TMP) '--> Standartofferten laden
                    End If

                    'SQL.doSQL("INSERT INTO Offertenpositionen WHERE KundenNr=" & kdnr & " AND  [OffertenNr]=" & kdnr & "")
--- a/SDL/kunden/usrCntlKundenuebersicht.vb
+++ b/SDL/kunden/usrCntlKundenuebersicht.vb
@@ -332,7 +332,8 @@ Public Class usrCntlKundenuebersicht
                lblFirma.Visible = True
                If Not (KdFirma = "IMEX" And VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO")) Then
                    If Not VERAG_PROG_ALLGEMEIN.cAllgemein.isCLUSTER Then
-                        If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_CLUSTER", "SDL") Then
+                        If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_CLUSTER", "SDL") And
+                             Not ((KdFirma = "IMEX" Or KdFirma = "VERAG") And VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL")) Then
                            dgvOfferteDetailsUebersicht.Visible = False
                            dgvOffenePosten.Visible = False
                            dgvUmsatzbericht.Visible = False
--- a/SDL/kunden/usrCntlOfferte.vb
+++ b/SDL/kunden/usrCntlOfferte.vb
@@ -6,7 +6,6 @@
    Public KD_ERW As VERAG_PROG_ALLGEMEIN.cKundenErweitert
    Public Event OfferteChanged()

-
    Dim OFFERTEBind As cEasyBinding
    Dim table
    Public BIND_DB = "FMZOLL"
--- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb
+++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb
@@ -22,16 +22,16 @@ Partial Class usrcntlKundeBearbeitenFull
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Me.tbcntrDetails = New System.Windows.Forms.TabControl()
        Me.tbAbfertigung = New System.Windows.Forms.TabPage()
        Me.tbcntrAbf = New System.Windows.Forms.TabControl()
@@ -222,6 +222,11 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.Label70 = New System.Windows.Forms.Label()
        Me.Label71 = New System.Windows.Forms.Label()
        Me.cboSonst_Rechnungsdruck = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.tbSchnittstellen = New System.Windows.Forms.TabPage()
+        Me.txtVERAG_Schnittstellen_ID = New System.Windows.Forms.TextBox()
+        Me.Label91 = New System.Windows.Forms.Label()
+        Me.Label92 = New System.Windows.Forms.Label()
+        Me.DataGridView1 = New System.Windows.Forms.DataGridView()
        Me.txtEORINL = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.txtEORI = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.Label33 = New System.Windows.Forms.Label()
@@ -279,7 +284,7 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.Label68 = New System.Windows.Forms.Label()
        Me.pnlNeukunde = New System.Windows.Forms.Panel()
        Me.cboFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.ComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cboKundenkreis = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Label77 = New System.Windows.Forms.Label()
        Me.lblKundennr = New System.Windows.Forms.Label()
        Me.txtERROR = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -290,11 +295,6 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.cbxFiBu = New System.Windows.Forms.CheckBox()
        Me.cbxFiBuLG = New System.Windows.Forms.CheckBox()
-        Me.tbSchnittstellen = New System.Windows.Forms.TabPage()
-        Me.txtVERAG_Schnittstellen_ID = New System.Windows.Forms.TextBox()
-        Me.Label91 = New System.Windows.Forms.Label()
-        Me.Label92 = New System.Windows.Forms.Label()
-        Me.DataGridView1 = New System.Windows.Forms.DataGridView()
        Me.tbcntrDetails.SuspendLayout()
        Me.tbAbfertigung.SuspendLayout()
        Me.tbcntrAbf.SuspendLayout()
@@ -317,14 +317,14 @@ Partial Class usrcntlKundeBearbeitenFull
        CType(Me.dgvUstv_LaenderUndSteuernummern, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.tbSonstiges.SuspendLayout()
        CType(Me.dgvSonst_IDSKunden, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.tbSchnittstellen.SuspendLayout()
+        CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.GroupBox3.SuspendLayout()
        Me.GroupBox1.SuspendLayout()
        Me.tbKontakt.SuspendLayout()
        Me.TabPage10.SuspendLayout()
        Me.TabPage11.SuspendLayout()
        Me.pnlNeukunde.SuspendLayout()
-        Me.tbSchnittstellen.SuspendLayout()
-        CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'tbcntrDetails
@@ -2247,8 +2247,8 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.dgvUmsatzbericht.AllowUserToDeleteRows = False
        Me.dgvUmsatzbericht.AllowUserToOrderColumns = True
        Me.dgvUmsatzbericht.AllowUserToResizeRows = False
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        DataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11
        Me.dgvUmsatzbericht.BackgroundColor = System.Drawing.Color.White
        Me.dgvUmsatzbericht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvUmsatzbericht.Location = New System.Drawing.Point(6, 25)
@@ -2345,8 +2345,8 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.dgvOffenePosten.AllowUserToDeleteRows = False
        Me.dgvOffenePosten.AllowUserToOrderColumns = True
        Me.dgvOffenePosten.AllowUserToResizeRows = False
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
+        DataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle12
        Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White
        Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvOffenePosten.Location = New System.Drawing.Point(6, 38)
@@ -2502,41 +2502,41 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.dgvKreditkarten.AllowUserToDeleteRows = False
        Me.dgvKreditkarten.AllowUserToOrderColumns = True
        Me.dgvKreditkarten.AllowUserToResizeRows = False
-        DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
+        DataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle13
        Me.dgvKreditkarten.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4
+        DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle14
        Me.dgvKreditkarten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle5
+        DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle15
        Me.dgvKreditkarten.Location = New System.Drawing.Point(9, 20)
        Me.dgvKreditkarten.MultiSelect = False
        Me.dgvKreditkarten.Name = "dgvKreditkarten"
        Me.dgvKreditkarten.ReadOnly = True
-        DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle6
+        DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle16
        Me.dgvKreditkarten.RowHeadersVisible = False
-        DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle7
+        DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle17
        Me.dgvKreditkarten.RowTemplate.DefaultCellStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.dgvKreditkarten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
        Me.dgvKreditkarten.Size = New System.Drawing.Size(642, 312)
@@ -2674,8 +2674,8 @@ Partial Class usrcntlKundeBearbeitenFull
        '
        'dgvUstv_LaenderUndSteuernummern
        '
-        DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8
+        DataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle18
        Me.dgvUstv_LaenderUndSteuernummern.BackgroundColor = System.Drawing.Color.White
        Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvUstv_LaenderUndSteuernummern.Location = New System.Drawing.Point(9, 94)
@@ -2888,8 +2888,8 @@ Partial Class usrcntlKundeBearbeitenFull
        'dgvSonst_IDSKunden
        '
        Me.dgvSonst_IDSKunden.AllowUserToResizeRows = False
-        DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
+        DataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle19
        Me.dgvSonst_IDSKunden.BackgroundColor = System.Drawing.Color.White
        Me.dgvSonst_IDSKunden.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvSonst_IDSKunden.Location = New System.Drawing.Point(9, 251)
@@ -3046,6 +3046,63 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.cboSonst_Rechnungsdruck.Size = New System.Drawing.Size(122, 21)
        Me.cboSonst_Rechnungsdruck.TabIndex = 1
        '
+        'tbSchnittstellen
+        '
+        Me.tbSchnittstellen.Controls.Add(Me.txtVERAG_Schnittstellen_ID)
+        Me.tbSchnittstellen.Controls.Add(Me.Label91)
+        Me.tbSchnittstellen.Controls.Add(Me.Label92)
+        Me.tbSchnittstellen.Controls.Add(Me.DataGridView1)
+        Me.tbSchnittstellen.Location = New System.Drawing.Point(4, 22)
+        Me.tbSchnittstellen.Name = "tbSchnittstellen"
+        Me.tbSchnittstellen.Padding = New System.Windows.Forms.Padding(3)
+        Me.tbSchnittstellen.Size = New System.Drawing.Size(672, 458)
+        Me.tbSchnittstellen.TabIndex = 10
+        Me.tbSchnittstellen.Text = "Schnittstellen"
+        Me.tbSchnittstellen.UseVisualStyleBackColor = True
+        '
+        'txtVERAG_Schnittstellen_ID
+        '
+        Me.txtVERAG_Schnittstellen_ID.Enabled = False
+        Me.txtVERAG_Schnittstellen_ID.Location = New System.Drawing.Point(131, 17)
+        Me.txtVERAG_Schnittstellen_ID.Name = "txtVERAG_Schnittstellen_ID"
+        Me.txtVERAG_Schnittstellen_ID.Size = New System.Drawing.Size(122, 20)
+        Me.txtVERAG_Schnittstellen_ID.TabIndex = 24
+        '
+        'Label91
+        '
+        Me.Label91.AutoSize = True
+        Me.Label91.Enabled = False
+        Me.Label91.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label91.Location = New System.Drawing.Point(6, 20)
+        Me.Label91.Name = "Label91"
+        Me.Label91.Size = New System.Drawing.Size(119, 13)
+        Me.Label91.TabIndex = 23
+        Me.Label91.Text = "VERAG Schnittellen-ID:"
+        '
+        'Label92
+        '
+        Me.Label92.AutoSize = True
+        Me.Label92.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label92.Location = New System.Drawing.Point(6, 77)
+        Me.Label92.Name = "Label92"
+        Me.Label92.Size = New System.Drawing.Size(110, 13)
+        Me.Label92.TabIndex = 21
+        Me.Label92.Text = "VERAG-Schnittstellen"
+        '
+        'DataGridView1
+        '
+        Me.DataGridView1.AllowUserToResizeRows = False
+        DataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle20
+        Me.DataGridView1.BackgroundColor = System.Drawing.Color.White
+        Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.DataGridView1.Enabled = False
+        Me.DataGridView1.Location = New System.Drawing.Point(9, 93)
+        Me.DataGridView1.MultiSelect = False
+        Me.DataGridView1.Name = "DataGridView1"
+        Me.DataGridView1.Size = New System.Drawing.Size(657, 358)
+        Me.DataGridView1.TabIndex = 22
+        '
        'txtEORINL
        '
        Me.txtEORINL._DateTimeOnly = False
@@ -3693,7 +3750,7 @@ Partial Class usrcntlKundeBearbeitenFull
        '
        Me.pnlNeukunde.Controls.Add(Me.Label50)
        Me.pnlNeukunde.Controls.Add(Me.cboFiliale)
-        Me.pnlNeukunde.Controls.Add(Me.ComboBox2)
+        Me.pnlNeukunde.Controls.Add(Me.cboKundenkreis)
        Me.pnlNeukunde.Controls.Add(Me.Label68)
        Me.pnlNeukunde.Location = New System.Drawing.Point(717, 487)
        Me.pnlNeukunde.Name = "pnlNeukunde"
@@ -3717,22 +3774,22 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.cboFiliale.Size = New System.Drawing.Size(195, 28)
        Me.cboFiliale.TabIndex = 1
        '
-        'ComboBox2
+        'cboKundenkreis
        '
-        Me.ComboBox2._allowedValuesFreiText = Nothing
-        Me.ComboBox2._allowFreiText = False
-        Me.ComboBox2._value = ""
-        Me.ComboBox2.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
-        Me.ComboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.ComboBox2.DropDownWidth = 400
-        Me.ComboBox2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.ComboBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.ComboBox2.FormattingEnabled = True
-        Me.ComboBox2.Items.AddRange(New Object() {"", "100000-199999: XXXXXX", "200000-299999: XXXXXX", "300000-399999: XXXXXX", "400000-499999: XXXXXX", "500000-599999: XXXXXX", "600000-699999: XXXXXX", "700000-799999: XXXXXX", "800000-899999: XXXXXX", "900000-999999: XXXXXX"})
-        Me.ComboBox2.Location = New System.Drawing.Point(104, 38)
-        Me.ComboBox2.Name = "ComboBox2"
-        Me.ComboBox2.Size = New System.Drawing.Size(195, 28)
-        Me.ComboBox2.TabIndex = 3
+        Me.cboKundenkreis._allowedValuesFreiText = Nothing
+        Me.cboKundenkreis._allowFreiText = False
+        Me.cboKundenkreis._value = ""
+        Me.cboKundenkreis.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
+        Me.cboKundenkreis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboKundenkreis.DropDownWidth = 400
+        Me.cboKundenkreis.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.cboKundenkreis.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboKundenkreis.FormattingEnabled = True
+        Me.cboKundenkreis.Items.AddRange(New Object() {"", "100000-199999: XXXXXX", "200000-299999: XXXXXX", "300000-399999: XXXXXX", "400000-499999: XXXXXX", "500000-599999: XXXXXX", "600000-699999: XXXXXX", "700000-799999: XXXXXX", "800000-899999: XXXXXX", "900000-999999: XXXXXX"})
+        Me.cboKundenkreis.Location = New System.Drawing.Point(104, 38)
+        Me.cboKundenkreis.Name = "cboKundenkreis"
+        Me.cboKundenkreis.Size = New System.Drawing.Size(195, 28)
+        Me.cboKundenkreis.TabIndex = 3
        '
        'Label77
        '
@@ -3864,63 +3921,6 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.cbxFiBuLG.UseVisualStyleBackColor = True
        Me.cbxFiBuLG.Visible = False
        '
-        'tbSchnittstellen
-        '
-        Me.tbSchnittstellen.Controls.Add(Me.txtVERAG_Schnittstellen_ID)
-        Me.tbSchnittstellen.Controls.Add(Me.Label91)
-        Me.tbSchnittstellen.Controls.Add(Me.Label92)
-        Me.tbSchnittstellen.Controls.Add(Me.DataGridView1)
-        Me.tbSchnittstellen.Location = New System.Drawing.Point(4, 22)
-        Me.tbSchnittstellen.Name = "tbSchnittstellen"
-        Me.tbSchnittstellen.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbSchnittstellen.Size = New System.Drawing.Size(672, 458)
-        Me.tbSchnittstellen.TabIndex = 10
-        Me.tbSchnittstellen.Text = "Schnittstellen"
-        Me.tbSchnittstellen.UseVisualStyleBackColor = True
-        '
-        'txtVERAG_Schnittstellen_ID
-        '
-        Me.txtVERAG_Schnittstellen_ID.Enabled = False
-        Me.txtVERAG_Schnittstellen_ID.Location = New System.Drawing.Point(131, 17)
-        Me.txtVERAG_Schnittstellen_ID.Name = "txtVERAG_Schnittstellen_ID"
-        Me.txtVERAG_Schnittstellen_ID.Size = New System.Drawing.Size(122, 20)
-        Me.txtVERAG_Schnittstellen_ID.TabIndex = 24
-        '
-        'Label91
-        '
-        Me.Label91.AutoSize = True
-        Me.Label91.Enabled = False
-        Me.Label91.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label91.Location = New System.Drawing.Point(6, 20)
-        Me.Label91.Name = "Label91"
-        Me.Label91.Size = New System.Drawing.Size(119, 13)
-        Me.Label91.TabIndex = 23
-        Me.Label91.Text = "VERAG Schnittellen-ID:"
-        '
-        'Label92
-        '
-        Me.Label92.AutoSize = True
-        Me.Label92.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label92.Location = New System.Drawing.Point(6, 77)
-        Me.Label92.Name = "Label92"
-        Me.Label92.Size = New System.Drawing.Size(110, 13)
-        Me.Label92.TabIndex = 21
-        Me.Label92.Text = "VERAG-Schnittstellen"
-        '
-        'DataGridView1
-        '
-        Me.DataGridView1.AllowUserToResizeRows = False
-        DataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10
-        Me.DataGridView1.BackgroundColor = System.Drawing.Color.White
-        Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.DataGridView1.Enabled = False
-        Me.DataGridView1.Location = New System.Drawing.Point(9, 93)
-        Me.DataGridView1.MultiSelect = False
-        Me.DataGridView1.Name = "DataGridView1"
-        Me.DataGridView1.Size = New System.Drawing.Size(657, 358)
-        Me.DataGridView1.TabIndex = 22
-        '
        'usrcntlKundeBearbeitenFull
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -3986,6 +3986,9 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.tbSonstiges.ResumeLayout(False)
        Me.tbSonstiges.PerformLayout()
        CType(Me.dgvSonst_IDSKunden, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.tbSchnittstellen.ResumeLayout(False)
+        Me.tbSchnittstellen.PerformLayout()
+        CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.GroupBox3.ResumeLayout(False)
        Me.GroupBox3.PerformLayout()
        Me.GroupBox1.ResumeLayout(False)
@@ -3996,9 +3999,6 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.TabPage11.ResumeLayout(False)
        Me.pnlNeukunde.ResumeLayout(False)
        Me.pnlNeukunde.PerformLayout()
-        Me.tbSchnittstellen.ResumeLayout(False)
-        Me.tbSchnittstellen.PerformLayout()
-        CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()

@@ -4235,7 +4235,7 @@ Partial Class usrcntlKundeBearbeitenFull
    Friend WithEvents ucKundenKontakte As usrCntlKundenKontakte
    Friend WithEvents Label50 As Label
    Friend WithEvents Label68 As Label
-    Friend WithEvents ComboBox2 As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents cboKundenkreis As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents cboFiliale As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents pnlNeukunde As Panel
    Friend WithEvents Label77 As Label
--- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb
+++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb
@@ -46,6 +46,7 @@ Public Class usrcntlKundeBearbeitenFull
        FISKAL = New cFiskal_Daten(kdnr)
        KUNDE_ERW = New VERAG_PROG_ALLGEMEIN.cKundenErweitert(kdnr)

+        cboFiliale.changeItem(loadValue(KUNDE.FilialenNr, "")) 'zuerst Filiale, dmait Kundennummernkreis später den Wert überschreiben kann!

        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
            Case "IMEX"
@@ -54,39 +55,56 @@ Public Class usrcntlKundeBearbeitenFull

        If ADRESSE.AdressenNr <= 0 Then

-            ComboBox2.Items.Clear()
-            Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
-                Case "IMEX"
-                    ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("1000000-1099999: IMEX", "1000000-1099990"))
-                    ComboBox2.changeItem("1000000-1099990")
-                Case "UNISPED"
-                    ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("2000000-2099999: UNISPED", "2000000-2099990"))
-                    ComboBox2.changeItem("2000000-2099990")
-                Case "AMBAR"
-                    ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("3000000-3099999: AMBAR", "3000000-3099990"))
-                    ComboBox2.changeItem("3000000-3099990")
-                Case "ATILLA"
-                    ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  100000-199999: ATILLA", "100000-199999"))
-                    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"))
-                    ComboBox2.changeItem("100000-199999")
-                Case Else
-                    If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ATILLA_VERWALTUNG", "AVISO") Then
-                        ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  100000-199999: ATILLA", "100000-199999"))
-                    End If
-                    ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  500000-599999: EV - Kunden", "500000-599999"))
-                    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("  900000-999999: Sonstige", "900000-999999"))
-                    ' ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("1000000-1099999: IMEX", "1000000-1099990"))
-                    ComboBox2.changeItem("728000-799999")
-            End Select
+            cboKundenkreis.Items.Clear()
+            If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Then
+                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("  900000-999999: Sonstige", "900000-999999"))
+                cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("1000000-1099999: IMEX", "1000000-1099990"))
+
+            Else
+
+                Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+                    Case "IMEX"
+                        cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("1000000-1099999: IMEX", "1000000-1099990"))
+                        cboKundenkreis.changeItem("1000000-1099990")
+                    Case "UNISPED"
+                        cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("2000000-2099999: UNISPED", "2000000-2099990"))
+                        cboKundenkreis.changeItem("2000000-2099990")
+                    Case "AMBAR"
+                        cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("3000000-3099999: AMBAR", "3000000-3099990"))
+                        cboKundenkreis.changeItem("3000000-3099990")
+                    Case "ATILLA"
+                        cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  100000-199999: ATILLA", "100000-199999"))
+                        cboKundenkreis.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"))
+                        cboKundenkreis.changeItem("100000-199999")
+
+
+                    Case Else
+                        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ATILLA_VERWALTUNG", "AVISO") Then
+                            cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  100000-199999: ATILLA", "100000-199999"))
+                        End If
+                        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"))
+                        '  ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  800000-899999: XXXXXX", "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")
+                End Select
+            End If

            pnlNeukunde.Visible = True
        End If

+
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then
+            cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 9900000-9999999: FRONT-OFFICE - Kunden", "9900000-9999999"))
+        End If
+
        usrCntlAufschubkonten.initMe(kdnr)

        ucKundenKontakte.btn.Visible = (kdnr > 0)
@@ -334,9 +352,9 @@ Public Class usrcntlKundeBearbeitenFull
        If ADRESSE.AdressenNr <= 0 Then

            If cboFiliale.Text = "" Then MsgBox("Bitte geben Sie die zuständige Filiale an!") : Return False
-            If Not ComboBox2._value.Contains("-") Then MsgBox("Bitte geben Sie den Kundenkreis an!") : Return False
+            If Not cboKundenkreis._value.Contains("-") Then MsgBox("Bitte geben Sie den Kundenkreis an!") : Return False

-            Dim s_KdNr = ComboBox2._value.Split("-")
+            Dim s_KdNr = cboKundenkreis._value.Split("-")
            Dim kdnr = VERAG_PROG_ALLGEMEIN.cAdressen.getHoechsteKdNr(s_KdNr(0), s_KdNr(1)) '+ 1

            If kdnr > 0 Then
@@ -1056,27 +1074,33 @@ Public Class usrcntlKundeBearbeitenFull

    End Sub

-    Private Sub ComboBox2_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboBox2.SelectedIndexChanged
+    Private Sub ComboBox2_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboKundenkreis.SelectedIndexChanged
+
        If ADRESSE Is Nothing OrElse ADRESSE.AdressenNr <= 0 Then
-            Select Case ComboBox2._value
-                Case "1000000-1099990" : cbxFiBu.Checked = True : cboFirma.changeItem("20")
-                Case "728000-799999" : cbxFiBu.Checked = True
-                Case "30000-49999" : cbxFiBu.Checked = True : cboFirma.changeItem("11")
-                Case "500000-599999" : cbxFiBu.Checked = True
-                Case "900000-999999" : cbxFiBu.Checked = False
-                Case "100000-199999" : cbxFiBu.Checked = False
+
+            Select Case cboKundenkreis._value
+                Case "1000000-1099990" : cbxFiBu.Checked = True : cboFirma.changeItem("20") : cboFiliale.changeItem("5501")
+                Case "2000000-2099990" : cbxFiBu.Checked = False : cboFirma.changeItem("21") : cboFiliale.changeItem("5601")
+                Case "728000-799999" : cbxFiBu.Checked = True : cboFirma.changeItem("1") : cboFiliale.changeItem("4803")
+                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 "100000-199999" : cbxFiBu.Checked = False : cboFirma.changeItem("1") : cboFiliale.changeItem("4803")
+                Case "9900000-9999999" : cbxFiBu.Checked = False : cboFirma.changeItem("17") : cboFiliale.changeItem("5801")
+
            End Select
        End If

        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
            Case "VERAG"
-                If ComboBox2._value = "100000-199999" Then
+                If cboKundenkreis._value = "100000-199999" Then
                    cboFiliale.changeItem("4801")
-                ElseIf ComboBox2._value = "1000000-1999999" Then
+                ElseIf cboKundenkreis._value = "1000000-1999999" Then
                    cboFiliale.changeItem("5501")
                Else
                    If cboFiliale._value = "4801" Then cboFiliale.changeItem("4803")
                End If
+
        End Select
    End Sub

@@ -1085,7 +1109,7 @@ Public Class usrcntlKundeBearbeitenFull
        cbxFiBu.Enabled = cboFiliale._value <> ""
        cbxFiBuLG.Enabled = cboFiliale._value <> ""
        If selCheck Then
-            cbxFiBu.Checked = (cboFirma._value <> "")
+            '  cbxFiBu.Checked = (cboFirma._value <> "") --> unterschiedlich
        End If
    End Sub

@@ -1106,11 +1130,24 @@ Public Class usrcntlKundeBearbeitenFull

    Private Sub cbxFiBu_CheckedChanged(sender As Object, e As EventArgs) Handles cbxFiBu.CheckedChanged, cbxFiBuLG.CheckedChanged
        If sender.checked Then
-            Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+            ' Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+            Dim FirmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+            If KUNDE IsNot Nothing And KUNDE.hasEntry Then
+                FirmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(KUNDE.FilialenNr, False)
+            End If
+            Select Case FirmaTmp
                Case "IMEX"
-                    selCheck = False
-                    cboFirma._value = 20
-                    selCheck = True
+                    If cboFiliale._value = "5501" Then
+                        selCheck = False
+                        cboFirma._value = 20
+                        selCheck = True
+                    End If
+                Case "FRONTOFFICE"
+                    If cboFiliale._value = "5801" Then
+                        selCheck = False
+                        cboFirma._value = 17
+                        selCheck = True
+                    End If
            End Select
        End If
    End Sub