neu

2021-06-24 23:05:48 +02:00
parent e625acc609
commit f2f992547d
134 changed files with 72921 additions and 2011 deletions
--- a/SDL/kunden/frmKundenUebersichtZOLL.vb
+++ b/SDL/kunden/frmKundenUebersichtZOLL.vb
@@ -313,7 +313,9 @@ Public Class frmKundenUebersichtZOLL

            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
+                Not ((KdFirma = "AMBAR") And VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_AMBAR", "SDL")) And
+                Not ((KdFirma = "FRONTOFFICE") And VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_FRONTOFFICE", "SDL")) And
+                Not ((KdFirma = "AMBAR") And VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_AMBAR", "SDL")) Then
                mnueOfferte.Enabled = False
                mnueRechnungen.Enabled = False
                mnueSpeditionsbuch.Enabled = False
--- a/SDL/kunden/frmKundenblatt.vb
+++ b/SDL/kunden/frmKundenblatt.vb
@@ -722,7 +722,7 @@ Public Class frmKundenblatt
        Try
            Dim connectionString As String = cSqlDb.GetSDLConnectionString

-            Dim sqlstr As String = "SELECT KundenNr,KfzKennzeichen, Nationalität, Abgemeldet, Verkauft,KZAenderung, Vermerk,Erfassungsdatum,Änderungsdatum,Sachbearbeiter FROM LKW WHERE KundenNr=" & kdNr & " "
+            Dim sqlstr As String = "SELECT KundenNr,KfzKennzeichen, Nationalität, Abgemeldet, Verkauft,KZAenderung, Vermerk,Erfassungsdatum,Änderungsdatum,Sachbearbeiter,Baujahr,[KzFinanzierungBank],[KzLeasing],[KzMiete] FROM LKW WHERE KundenNr=" & kdNr & " "
            If TextBox11.Text <> "" Then sqlstr &= " AND KfzKennzeichen LIKE '" & TextBox11.Text & "%'" 'Suchparam
            ' MsgBox(sqlstr)
            Me.dataAdapterLKW = New SqlDataAdapter(sqlstr, connectionString)
@@ -762,6 +762,11 @@ Public Class frmKundenblatt
            .AllowUserToOrderColumns = True

            .Columns("KundenNr").Visible = False
+            .Columns("Baujahr").Visible = False
+            .Columns("KzFinanzierungBank").Visible = False
+            .Columns("KzLeasing").Visible = False
+            .Columns("KzMiete").Visible = False
+

            .Columns("KfzKennzeichen").MinimumWidth = 100
            .Columns("KfzKennzeichen").HeaderText = "KFZ-Kennzeichen"
@@ -1137,9 +1142,9 @@ Public Class frmKundenblatt

    Private Sub dgvSDLLeistungenFull_CellClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvSDLLeistungenFull.CellClick
        If dgvSDLLeistungenFull.SelectedRows.Count > 0 Then
-            If Not dgvSDLLeistungenFull.CurrentRow.Cells(9).Value Is DBNull.Value Then lblErfassungsdatum_SDL.Text = dgvSDLLeistungenFull.CurrentRow.Cells(9).Value
-            If Not dgvSDLLeistungenFull.CurrentRow.Cells(10).Value Is DBNull.Value Then lblAenderungsdatum_SDL.Text = dgvSDLLeistungenFull.CurrentRow.Cells(10).Value
-            If Not dgvSDLLeistungenFull.CurrentRow.Cells(11).Value Is DBNull.Value Then lblLetzterSA_SDL.Text = dgvSDLLeistungenFull.CurrentRow.Cells(11).Value
+            If Not dgvSDLLeistungenFull.SelectedRows(0).Cells(9).Value Is DBNull.Value Then lblErfassungsdatum_SDL.Text = dgvSDLLeistungenFull.SelectedRows(0).Cells(9).Value
+            If Not dgvSDLLeistungenFull.SelectedRows(0).Cells(10).Value Is DBNull.Value Then lblAenderungsdatum_SDL.Text = dgvSDLLeistungenFull.SelectedRows(0).Cells(10).Value
+            If Not dgvSDLLeistungenFull.SelectedRows(0).Cells(11).Value Is DBNull.Value Then lblLetzterSA_SDL.Text = dgvSDLLeistungenFull.SelectedRows(0).Cells(11).Value
        End If
    End Sub

@@ -1147,8 +1152,8 @@ Public Class frmKundenblatt
        If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_Leistungen_bearbeiten", "SDL") Then Exit Sub

        If dgvSDLLeistungenFull.SelectedRows.Count > 0 Then
-            If vbYes = MsgBox("Möchten Sie die Leistung wirklich löschen? " & vbNewLine & vbNewLine & dgvSDLLeistungenFull.CurrentRow.Cells("SDLNr").Value & " - " & dgvSDLLeistungenFull.CurrentRow.Cells("SDLBez").Value, vbYesNo) Then
-                kundenSQL.delKundenSDL(kdNr, dgvSDLLeistungenFull.CurrentRow.Cells(0).Value)
+            If vbYes = MsgBox("Möchten Sie die Leistung wirklich löschen? " & vbNewLine & vbNewLine & dgvSDLLeistungenFull.SelectedRows(0).Cells("SDLNr").Value & " - " & dgvSDLLeistungenFull.SelectedRows(0).Cells("SDLBez").Value, vbYesNo) Then
+                kundenSQL.delKundenSDL(kdNr, dgvSDLLeistungenFull.SelectedRows(0).Cells(0).Value)
            End If

            dgvSDLLeistungenFull.Columns.Clear()
@@ -1171,7 +1176,7 @@ Public Class frmKundenblatt
        If dgvSDLLeistungenFull.SelectedRows.Count > 0 Then
            Panel2.Visible = True
            'Scan-Elemente initialisieren:
-            Dim tmpSDLNr = dgvSDLLeistungenFull.CurrentRow.Cells(0).Value
+            Dim tmpSDLNr = dgvSDLLeistungenFull.SelectedRows(0).Cells("SDLNr").Value
            scanErstbestellung.INIT(kdNr, "MDM_Leistung", "SDL_" & tmpSDLNr)
            scanJaraVereinbarung.INIT(kdNr, "MDM_Leistung", "SDL_" & tmpSDLNr)
            scanMWSTAgreement.INIT(kdNr, "MDM_Leistung", "SDL_" & tmpSDLNr)
@@ -1217,7 +1222,7 @@ Public Class frmKundenblatt

    Private Sub Button6_Click(sender As Object, e As EventArgs) Handles Button6.Click, Button15.Click
        If dgvSDLLeistungenFull.SelectedRows.Count > 0 Then
-            Dim sdlNrTmp = dgvSDLLeistungenFull.CurrentRow.Cells(0).Value
+            Dim sdlNrTmp = dgvSDLLeistungenFull.SelectedRows(0).Cells(0).Value
            Select Case sdlNrTmp
                Case 100 : kundenSQL.setPartnerKdNrFromFMZOLL_IDS(kdNr, txtPartnerKdNr.Text) 'IDS :
                    'gibt keine Einträge
@@ -1331,10 +1336,10 @@ Public Class frmKundenblatt


    Private Sub Button12_Click(sender As Object, e As EventArgs) Handles Button12.Click
-        If dgvSDLLeistungenFull.SelectedCells.Count > 0 Then
+        If dgvSDLLeistungenFull.SelectedRows.Count > 0 Then
            Dim frmSDLDetails As New frmSDLDetails
            frmSDLDetails.KdNr = kdNr
-            frmSDLDetails.sdlNr = dgvSDLLeistungenFull.CurrentRow.Cells(0).Value
+            frmSDLDetails.sdlNr = dgvSDLLeistungenFull.SelectedRows(0).Cells(0).Value
            Me.Enabled = False
            If frmSDLDetails.ShowDialog(Me) = vbOK Then
                initTABSDL_Leistungen()
@@ -1534,10 +1539,89 @@ Public Class frmKundenblatt
  
    Private Sub Button13_Click(sender As Object, e As EventArgs) Handles Button13.Click
        Me.Cursor = Cursors.WaitCursor
-        cProgramFunctions.genExcelFromDGV_NEW(dgvLKW, True)
+        'cProgramFunctions.genExcelFromDGV_NEW(dgvLKW, True)
+        Dim Path = ""
+        genLKWListeExcel(cProgramFunctions.dgridViewTods(dgvLKW), Path)
+        If Path <> "" Then Process.Start(Path)
        Me.Cursor = Cursors.Default
    End Sub

+
+    Shared Function genLKWListeExcel(dt As DataTable, ByRef Path As String) As Boolean
+        Try
+
+            If dt IsNot Nothing And dt.Rows.Count > 0 Then
+
+
+                Dim sPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\LKWListe\" ' My.Computer.FileSystem.GetTempFileName
+                If Not My.Computer.FileSystem.DirectoryExists(sPath) Then
+                    My.Computer.FileSystem.CreateDirectory(sPath)
+                End If
+
+
+                Dim exclApp As Object 'as Application
+                Dim Datei As Object 'as WorkBook
+                Dim Blatt As Object 'Microsoft.Office.Interop.Excel.Worksheet 'As Object 'as Worksheet
+                exclApp = CreateObject("Excel.Application")
+
+                With exclApp
+                    .Visible = False
+
+                    Try
+                        Path = sPath & "LKWListe_" & dt.Rows(0)("KundenNr") & ".xlsx"
+                        While System.IO.File.Exists(Path)
+                            Path = sPath & "LKWListe_" & dt.Rows(0)("KundenNr") & "_" & Now.ToString("ddMMyyyyHHmmss") & ".xlsx"
+                        End While
+                        My.Computer.FileSystem.WriteAllBytes(Path, My.Resources.LKW_Liste, False)
+                    Catch ex As System.Exception
+                        '  MsgBox(ex.Message)
+                        MsgBox("ERROR 01: " & ex.Message & vbNewLine & ex.StackTrace)
+                        Return False
+                    End Try
+
+
+                    Datei = .Workbooks.Open(Path) 'Anpassen
+                    Blatt = Datei.Worksheets(1) 'Anpassen
+
+                    Blatt.Range("L1").Value = Now.ToShortDateString
+                    Dim cnt = 4
+                    For Each r In dt.Rows
+                        If cnt = 4 Then
+                            Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(r("KundenNr"))
+                            Blatt.Range("D1").Value = r("KundenNr")
+                            Blatt.Range("E1").Value = (AD.Name_1 & " " & If(AD.Name_2, "")).trim
+                        End If
+
+                        Blatt.Range("A" & cnt).Value = r("KundenNr")
+                        Blatt.Range("B" & cnt).Value = r("KfzKennzeichen")
+                        Blatt.Range("C" & cnt).Value = r("Nationalität")
+                        Blatt.Range("D" & cnt).Value = VERAG_PROG_ALLGEMEIN.SQL.checkNullDateReturnValue(r("Baujahr"), "") 'If(r("Abgemeldet") IsNot DBNull.Value, CDate(r("Baujahr")).ToShortDateString, "")
+                        Blatt.Range("E" & cnt).Value = If(VERAG_PROG_ALLGEMEIN.SQL.checkNullBool(r("Abgemeldet")), "x", "")
+                        '  Blatt.Range("F" & cnt).Value = r("Kennzeichen")
+                        Blatt.Range("G" & cnt).Value = If(VERAG_PROG_ALLGEMEIN.SQL.checkNullBool(r("KzMiete")), "x", "")
+                        Blatt.Range("H" & cnt).Value = If(VERAG_PROG_ALLGEMEIN.SQL.checkNullBool(r("KzLeasing")), "x", "")
+                        Blatt.Range("I" & cnt).Value = If(VERAG_PROG_ALLGEMEIN.SQL.checkNullBool(r("KzFinanzierungBank")), "x", "")
+                        Blatt.Range("J" & cnt).Value = If(VERAG_PROG_ALLGEMEIN.SQL.checkNullBool(r("Verkauft")), "x", "")
+                        Blatt.Range("K" & cnt).Value = If(VERAG_PROG_ALLGEMEIN.SQL.checkNullBool(r("KZAenderung")), "x", "")
+                        Blatt.Range("L" & cnt).Value = r("Vermerk")
+
+                        cnt += 1
+                    Next
+                    Datei.Save
+                    Datei.Close()
+                    Datei = Nothing
+                    exclApp = Nothing
+
+                End With
+
+                Return True
+            End If
+
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+        End Try
+        Return False
+    End Function
    Private Sub frmKundenblatt_Shown(sender As Object, e As EventArgs) Handles Me.Shown
        If showEdit Then changeTab(1, ToolStripMenuItem2)

--- a/SDL/kunden/frmOffertenBearbeiten.vb
+++ b/SDL/kunden/frmOffertenBearbeiten.vb
@@ -27,7 +27,7 @@
        Dim where = ""
        Select Case FIRMA_TMP
            Case "IMEX"
-                where = " WHERE [Offertenstamm].[OffertenNr] IN (1,2,3,4,5,6,7,8,9,10,26,27,29)"
+                where = " WHERE [Offertenstamm].[OffertenNr] IN (1,2,3,4,5,6,7,8,9,10,26,27,29,50,51)"
        End Select
        Dim SQLsrt = " SELECT (select case when COUNT(*)>0 then 1 else 0 end FROM Offerten where  KundenNr=" & kdnr & " and  [Offerten].[OffertenNr]=[Offertenstamm].[OffertenNr]) as vorhanden," &
                    " [Offertenstamm].[OffertenNr],[OffertenBez] FROM Offertenstamm  " & where & " order by OffertenNr"
--- a/SDL/kunden/usrCntlKundenBesonderheiten.vb
+++ b/SDL/kunden/usrCntlKundenBesonderheiten.vb
@@ -40,8 +40,8 @@

    Sub init(kdNr, Optional Kategorie = "", Optional simpleView = False, Optional preferedKategorie = "", Optional preferedKategorieOtherIN = "")
        loaded = False
-        If simpleView Then Panel1.Visible = False 'showhideOptions(False)
-        cboKategorie.changeItem(Kategorie)
+        If simpleView Then Panel1.Height = 0 : Panel1.Visible = False 'showhideOptions(False)
+            cboKategorie.changeItem(Kategorie)
        cbx.Checked = False
        initDGV(kdNr, simpleView, preferedKategorie, preferedKategorieOtherIN)
        loaded = True
@@ -75,9 +75,10 @@

            Dim order = " ORDER BY kdb_AenderungAm desc"
            Dim katIN = " "
+
            If preferedKategorie <> "" Then
-                order = " ORDER BY CASE WHEN kdb_kategorie = '" & preferedKategorie & "' THEN 1 ELSE 2 END desc, kdb_AenderungAm desc "
-                If katIN <> "" Then order = " AND kdb_kategorie IN(" & preferedKategorieOtherIN & ",'" & preferedKategorie & "') "
+                order = " ORDER BY CASE WHEN kdb_kategorie = '" & preferedKategorie & "' THEN 1 ELSE 2 END ASC, kdb_AenderungAm desc "
+                If preferedKategorieOtherIN <> "" Then katIN = " AND kdb_kategorie IN(" & preferedKategorieOtherIN & ",'" & preferedKategorie & "') "
            End If

            .DataSource = SQL.loadDgvBySql("Select kdb_id, kdb_AenderungAm,kdb_text,kdb_mitId,kdb_mitName,kdb_EingetragenAm,kdb_kategorie, kdb_hervorheben,kdb_history  FROM [tblKundenBesonderheiten] where kdb_KundenNr=" & kdNr & " And kdb_visible=1  " & katIN & where & " " & order, "FMZOLL")
--- a/SDL/kunden/usrCntlKundenuebersicht.vb
+++ b/SDL/kunden/usrCntlKundenuebersicht.vb
@@ -96,7 +96,7 @@ Public Class usrCntlKundenuebersicht
            connection.Close()

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

@@ -177,7 +177,7 @@ Public Class usrCntlKundenuebersicht
                    tbcntrAllg.TabPages.Remove(tbAvisoMail)
                    tbcntrAllg.TabPages.Remove(tbKdSpez)
                Catch ex As Exception
-
+                    VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
                End Try
            End If

@@ -223,7 +223,7 @@ Public Class usrCntlKundenuebersicht

            VERAG_PROG_ALLGEMEIN.cAllgemein._TRANSLATE(Me)
        Catch ex As Exception
-            '  MsgBox(ex.Message & ex.StackTrace)
+            'VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
        End Try
    End Sub

@@ -603,7 +603,7 @@ Public Class usrCntlKundenuebersicht
            '     Button4.Visible = False
            '  Button5.Visible = False
        Catch ex As Exception
-            MsgBox("Es ist ein Fehler beim Laden der Firmendaten - Allgemein aufgetreten!" & vbNewLine & vbNewLine & ex.Message & ex.StackTrace)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "Es ist ein Fehler beim Laden der Firmendaten - Allgemein aufgetreten!")
        End Try
    End Sub

@@ -619,7 +619,7 @@ Public Class usrCntlKundenuebersicht

            kdErwTmp.SAVE()
        Catch ex As Exception
-            MsgBox("Fehler beim Speichern." & vbNewLine & ex.Message)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
        End Try
    End Sub

@@ -1204,7 +1204,7 @@ Public Class usrCntlKundenuebersicht
                Next

            Catch ex As Exception
-                MsgBox("OP: " & ex.Message)
+                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
            End Try

            'Dim OP_tmp As Double = 0
@@ -1330,7 +1330,7 @@ Public Class usrCntlKundenuebersicht
                    End If
                Next
            Catch ex As Exception
-                MsgBox("OP: " & ex.Message)
+                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
            End Try
            txtOPFaellig.Text = sumZZ.ToString("C")
            If sumZZ > 0 Then
@@ -1414,7 +1414,7 @@ Public Class usrCntlKundenuebersicht
                '  cntxtVollmachten.Show(dgvVollmachten, dgvVollmachten.PointToClient(Cursor.Position))
            End If
        Catch ex As Exception
-            MsgBox(ex.Message)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
        End Try
    End Sub

@@ -1688,10 +1688,10 @@ Public Class usrCntlKundenuebersicht

        Catch ex2 As InvalidOperationException
            'Server.GetLastError()
-            MsgBox(ex2.Message & ex2.StackTrace)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex2.Message, ex2.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
        Catch ex As Exception
            'Server.GetLastError()
-            MsgBox(ex.Message & ex.StackTrace)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)

        End Try
        sender.BackgroundImage = My.Resources.del
@@ -2022,7 +2022,7 @@ Public Class usrCntlKundenuebersicht
            GG.gg_erhalten_Datum = txtGGDatum._value
            GG.gg_Zollamt = If(cbxGG.Checked, "GENERELL", txtT1VerzollungsadresseBestimmungszollstelle._value)

-            If Not Button9.Visible AndAlso VERAG_PROG_ALLGEMEIN.cGestellungsgarantien.ENTRY_Exists(kdNr, GG.gg_Zollamt) Then
+            If Not Button9.Visible AndAlso VERAG_PROG_ALLGEMEIN.cGestellungsgarantien.ENTRY_Exists(kdNr, GG.gg_Zollamt, txtGGDatum._value) Then
                MsgBox("Der Eintrag existiert bereits!")
                Exit Sub
            End If
--- 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 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 DataGridViewCellStyle11 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.lblHinweisKdNr = New System.Windows.Forms.Label()
@@ -83,6 +83,11 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.tbFiskal = New System.Windows.Forms.TabPage()
        Me.UsrCntlKundeFiskaldaten1 = New SDL.usrCntlKundeFiskaldaten()
        Me.tbVerrechnung = New System.Windows.Forms.TabPage()
+        Me.Label95 = New System.Windows.Forms.Label()
+        Me.cboRechnungSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cbxSammelrechnungBerichtLeistungsdetails = New System.Windows.Forms.CheckBox()
+        Me.cbxAPITradeshift = New System.Windows.Forms.CheckBox()
+        Me.Label94 = New System.Windows.Forms.Label()
        Me.cbxVeranlagungskunde = New System.Windows.Forms.CheckBox()
        Me.Label93 = New System.Windows.Forms.Label()
        Me.txtDebKdNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -210,6 +215,8 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.txtUSt_GVAusgestelltAm = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.txtUSt_GVAngefordertAm = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.tbSonstiges = New System.Windows.Forms.TabPage()
+        Me.txtSonst_KdNrTOBB = New System.Windows.Forms.TextBox()
+        Me.Label96 = New System.Windows.Forms.Label()
        Me.txtSonst_KdNrPLOSE = New System.Windows.Forms.TextBox()
        Me.Label83 = New System.Windows.Forms.Label()
        Me.btnSonstAendSpeichern = New VERAG_PROG_ALLGEMEIN.FlatButton()
@@ -305,8 +312,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.Label94 = New System.Windows.Forms.Label()
-        Me.cbxAPITradeshift = New System.Windows.Forms.CheckBox()
        Me.tbcntrDetails.SuspendLayout()
        Me.tbAbfertigung.SuspendLayout()
        Me.tbcntrAbf.SuspendLayout()
@@ -979,6 +984,9 @@ Partial Class usrcntlKundeBearbeitenFull
        '
        'tbVerrechnung
        '
+        Me.tbVerrechnung.Controls.Add(Me.Label95)
+        Me.tbVerrechnung.Controls.Add(Me.cboRechnungSprache)
+        Me.tbVerrechnung.Controls.Add(Me.cbxSammelrechnungBerichtLeistungsdetails)
        Me.tbVerrechnung.Controls.Add(Me.cbxAPITradeshift)
        Me.tbVerrechnung.Controls.Add(Me.Label94)
        Me.tbVerrechnung.Controls.Add(Me.cbxVeranlagungskunde)
@@ -1026,6 +1034,63 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.tbVerrechnung.Text = "Verrechnung"
        Me.tbVerrechnung.UseVisualStyleBackColor = True
        '
+        'Label95
+        '
+        Me.Label95.AutoSize = True
+        Me.Label95.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label95.Location = New System.Drawing.Point(414, 135)
+        Me.Label95.Name = "Label95"
+        Me.Label95.Size = New System.Drawing.Size(70, 13)
+        Me.Label95.TabIndex = 38
+        Me.Label95.Text = "Rg.-Sprache:"
+        '
+        'cboRechnungSprache
+        '
+        Me.cboRechnungSprache._allowedValuesFreiText = Nothing
+        Me.cboRechnungSprache._allowFreiText = False
+        Me.cboRechnungSprache._value = ""
+        Me.cboRechnungSprache.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
+        Me.cboRechnungSprache.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboRechnungSprache.DropDownWidth = 200
+        Me.cboRechnungSprache.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.cboRechnungSprache.ForeColor = System.Drawing.Color.Black
+        Me.cboRechnungSprache.FormattingEnabled = True
+        Me.cboRechnungSprache.Location = New System.Drawing.Point(527, 132)
+        Me.cboRechnungSprache.Name = "cboRechnungSprache"
+        Me.cboRechnungSprache.Size = New System.Drawing.Size(73, 21)
+        Me.cboRechnungSprache.TabIndex = 39
+        '
+        'cbxSammelrechnungBerichtLeistungsdetails
+        '
+        Me.cbxSammelrechnungBerichtLeistungsdetails.AutoSize = True
+        Me.cbxSammelrechnungBerichtLeistungsdetails.Location = New System.Drawing.Point(417, 178)
+        Me.cbxSammelrechnungBerichtLeistungsdetails.Name = "cbxSammelrechnungBerichtLeistungsdetails"
+        Me.cbxSammelrechnungBerichtLeistungsdetails.Size = New System.Drawing.Size(225, 17)
+        Me.cbxSammelrechnungBerichtLeistungsdetails.TabIndex = 37
+        Me.cbxSammelrechnungBerichtLeistungsdetails.Text = "Sammelrechnung Bericht: Leistungsdetails"
+        Me.cbxSammelrechnungBerichtLeistungsdetails.UseVisualStyleBackColor = True
+        '
+        'cbxAPITradeshift
+        '
+        Me.cbxAPITradeshift.AutoSize = True
+        Me.cbxAPITradeshift.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cbxAPITradeshift.Location = New System.Drawing.Point(417, 382)
+        Me.cbxAPITradeshift.Name = "cbxAPITradeshift"
+        Me.cbxAPITradeshift.Size = New System.Drawing.Size(157, 17)
+        Me.cbxAPITradeshift.TabIndex = 36
+        Me.cbxAPITradeshift.Text = "Rechnungskopie Tradeshift"
+        Me.cbxAPITradeshift.UseVisualStyleBackColor = True
+        '
+        'Label94
+        '
+        Me.Label94.AutoSize = True
+        Me.Label94.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label94.Location = New System.Drawing.Point(414, 358)
+        Me.Label94.Name = "Label94"
+        Me.Label94.Size = New System.Drawing.Size(168, 13)
+        Me.Label94.TabIndex = 35
+        Me.Label94.Text = "Fremd-Abrechnungssysteme:"
+        '
        'cbxVeranlagungskunde
        '
        Me.cbxVeranlagungskunde.AutoSize = True
@@ -2379,8 +2444,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
+        DataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle12
        Me.dgvUmsatzbericht.BackgroundColor = System.Drawing.Color.White
        Me.dgvUmsatzbericht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvUmsatzbericht.Location = New System.Drawing.Point(6, 25)
@@ -2477,8 +2542,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
+        DataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle13
        Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White
        Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvOffenePosten.Location = New System.Drawing.Point(6, 38)
@@ -2634,41 +2699,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
+        DataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14
        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
+        DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control
+        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.WindowText
+        DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle15
        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
+        DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window
+        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.ControlText
+        DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle16
        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
+        DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle17
        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
+        DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle18
        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)
@@ -2806,8 +2871,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
+        DataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle19
        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)
@@ -2942,6 +3007,8 @@ Partial Class usrcntlKundeBearbeitenFull
        '
        'tbSonstiges
        '
+        Me.tbSonstiges.Controls.Add(Me.txtSonst_KdNrTOBB)
+        Me.tbSonstiges.Controls.Add(Me.Label96)
        Me.tbSonstiges.Controls.Add(Me.txtSonst_KdNrPLOSE)
        Me.tbSonstiges.Controls.Add(Me.Label83)
        Me.tbSonstiges.Controls.Add(Me.btnSonstAendSpeichern)
@@ -2971,6 +3038,25 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.tbSonstiges.Text = "Sonstiges"
        Me.tbSonstiges.UseVisualStyleBackColor = True
        '
+        'txtSonst_KdNrTOBB
+        '
+        Me.txtSonst_KdNrTOBB.Location = New System.Drawing.Point(119, 201)
+        Me.txtSonst_KdNrTOBB.MaxLength = 20
+        Me.txtSonst_KdNrTOBB.Name = "txtSonst_KdNrTOBB"
+        Me.txtSonst_KdNrTOBB.Size = New System.Drawing.Size(122, 20)
+        Me.txtSonst_KdNrTOBB.TabIndex = 22
+        '
+        'Label96
+        '
+        Me.Label96.AutoSize = True
+        Me.Label96.Enabled = False
+        Me.Label96.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label96.Location = New System.Drawing.Point(6, 204)
+        Me.Label96.Name = "Label96"
+        Me.Label96.Size = New System.Drawing.Size(83, 13)
+        Me.Label96.TabIndex = 21
+        Me.Label96.Text = "KdNr bei TOBB:"
+        '
        'txtSonst_KdNrPLOSE
        '
        Me.txtSonst_KdNrPLOSE.Enabled = False
@@ -3011,7 +3097,7 @@ Partial Class usrcntlKundeBearbeitenFull
        '
        Me.Label76.AutoSize = True
        Me.Label76.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label76.Location = New System.Drawing.Point(9, 227)
+        Me.Label76.Location = New System.Drawing.Point(9, 233)
        Me.Label76.Name = "Label76"
        Me.Label76.Size = New System.Drawing.Size(65, 13)
        Me.Label76.TabIndex = 17
@@ -3020,8 +3106,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
+        DataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11
        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)
@@ -3033,7 +3119,7 @@ Partial Class usrcntlKundeBearbeitenFull
        'cbxSonst_CsvAsfinag
        '
        Me.cbxSonst_CsvAsfinag.AutoSize = True
-        Me.cbxSonst_CsvAsfinag.Location = New System.Drawing.Point(119, 201)
+        Me.cbxSonst_CsvAsfinag.Location = New System.Drawing.Point(119, 228)
        Me.cbxSonst_CsvAsfinag.Name = "cbxSonst_CsvAsfinag"
        Me.cbxSonst_CsvAsfinag.Size = New System.Drawing.Size(264, 17)
        Me.cbxSonst_CsvAsfinag.TabIndex = 15
@@ -3224,8 +3310,8 @@ Partial Class usrcntlKundeBearbeitenFull
        '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
+        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
@@ -4064,27 +4150,6 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.cbxFiBuLG.UseVisualStyleBackColor = True
        Me.cbxFiBuLG.Visible = False
        '
-        'Label94
-        '
-        Me.Label94.AutoSize = True
-        Me.Label94.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label94.Location = New System.Drawing.Point(414, 358)
-        Me.Label94.Name = "Label94"
-        Me.Label94.Size = New System.Drawing.Size(168, 13)
-        Me.Label94.TabIndex = 35
-        Me.Label94.Text = "Fremd-Abrechnungssysteme:"
-        '
-        'cbxAPITradeshift
-        '
-        Me.cbxAPITradeshift.AutoSize = True
-        Me.cbxAPITradeshift.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cbxAPITradeshift.Location = New System.Drawing.Point(417, 382)
-        Me.cbxAPITradeshift.Name = "cbxAPITradeshift"
-        Me.cbxAPITradeshift.Size = New System.Drawing.Size(157, 17)
-        Me.cbxAPITradeshift.TabIndex = 36
-        Me.cbxAPITradeshift.Text = "Rechnungskopie Tradeshift"
-        Me.cbxAPITradeshift.UseVisualStyleBackColor = True
-        '
        'usrcntlKundeBearbeitenFull
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -4443,4 +4508,9 @@ Partial Class usrcntlKundeBearbeitenFull
    Friend WithEvents Button2 As Button
    Friend WithEvents cbxAPITradeshift As CheckBox
    Friend WithEvents Label94 As Label
+    Friend WithEvents cbxSammelrechnungBerichtLeistungsdetails As CheckBox
+    Friend WithEvents Label95 As Label
+    Friend WithEvents cboRechnungSprache As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents txtSonst_KdNrTOBB As TextBox
+    Friend WithEvents Label96 As Label
 End Class
--- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb
+++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb
@@ -100,11 +100,16 @@ Public Class usrcntlKundeBearbeitenFull
                End Select
            End If

+            If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "AMBAR" And VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_AMBAR", "SDL") Then
+                cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("3000000-3099999: AMBAR", "3000000-3099990"))
+
+            End If
+
            pnlNeukunde.Visible = True
-        End If
+            End If


-        If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then
+            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

@@ -202,7 +207,7 @@ Public Class usrcntlKundeBearbeitenFull

        cboAbf_Steuerschluessel._value = loadValue(KUNDE.Steuerschlüssel, "")
        cboAbf_Waehrung._value = loadValue(KUNDE.Währungscode, "EUR")
-
+        cbxSammelrechnungBerichtLeistungsdetails.Checked = loadValue(KUNDE_ERW.kde_FakturierungSR_Details, False)
        cboAbf_Sammelrechnung._value = loadValue(KUNDE.Sammelrechnung, "")


@@ -281,6 +286,7 @@ Public Class usrcntlKundeBearbeitenFull

        cbxAPITradeshift.Checked = loadValue(KUNDE_ERW.kde_API_Tradeshift, False)

+        cboRechnungSprache._value = loadValue(KUNDE_ERW.kde_Fakturierung_Sprache, "")

        txtVERAG_Schnittstellen_ID.Text = If(KUNDE_ERW.kde_VERAG_INTERFACE_ID, "")
        ' ----- Abfertigungsverbot -----
@@ -325,6 +331,7 @@ Public Class usrcntlKundeBearbeitenFull
        txtSonst_KdNrTelepass.Text = loadValue(ADRESSE.TELEPASS_Kd_Nr, "")
        txtSonst_KdNrPLOSE.Text = loadValue(ADRESSE.PLOSEKundenNr, "")
        txtSonst_KdNrUTA.Text = loadValue(ADRESSE.UTAKundenNr, "")
+        txtSonst_KdNrTOBB.Text = loadValue(KUNDE_ERW.kde_TOBB_KundenNr, "")

        cbxSonst_CsvAsfinag.Checked = loadValue(ADRESSE.ASFINAGExportCSV, False)
        cbxSonst_CsvMautbericht.Checked = loadValue(ADRESSE.ExportMautberichtCSV, False)
@@ -482,6 +489,7 @@ Public Class usrcntlKundeBearbeitenFull
        KUNDE.Währungscode = isLeerNothing(cboAbf_Waehrung._value)
        KUNDE.Sammelrechnung = cboAbf_Sammelrechnung._value

+        KUNDE_ERW.kde_FakturierungSR_Details = cbxSammelrechnungBerichtLeistungsdetails.Checked
        KUNDE.EORITIN = isLeerNothing(txtEORI.Text)

        If IsNumeric(txtEORINL.Text) Then
@@ -549,6 +557,8 @@ Public Class usrcntlKundeBearbeitenFull
        KUNDE_ERW.kde_BesonderheitenNeu = cbxBesonderheitenNEU.Checked

        KUNDE_ERW.kde_API_Tradeshift = cbxAPITradeshift.Checked
+        KUNDE_ERW.kde_Fakturierung_Sprache = isLeerNothing(cboRechnungSprache._value)
+

        ' ----- Fremdsped -----
        KUNDE_ERW.kde_KundeFremdspedition = cbxVerzolltBei.Checked
@@ -597,6 +607,7 @@ Public Class usrcntlKundeBearbeitenFull
        ADRESSE.TELEPASS_Kd_Nr = isLeerNothing(txtSonst_KdNrTelepass.Text)
        ADRESSE.PLOSEKundenNr = isLeerNothing(txtSonst_KdNrPLOSE.Text)
        ADRESSE.UTAKundenNr = isLeerNothing(txtSonst_KdNrUTA.Text)
+        KUNDE_ERW.kde_TOBB_KundenNr = isLeerNothing(txtSonst_KdNrTOBB.Text)
        ADRESSE.ASFINAGExportCSV = cbxSonst_CsvAsfinag.Checked
        ADRESSE.ExportMautberichtCSV = cbxSonst_CsvMautbericht.Checked
        ADRESSE.MSEExportCSV = cbxSonst_CsvMSE.Checked
@@ -608,7 +619,6 @@ Public Class usrcntlKundeBearbeitenFull



-
        UsrCntlKundeFiskaldaten1.loadinClass(FISKAL, KUNDE_ERW)

        Return True
@@ -676,7 +686,7 @@ Public Class usrcntlKundeBearbeitenFull

        cboUSt_UstIdNrLand.fillWithSQL(" SELECT [Länderverzeichnis für die Außenhandelsstatistik].LandKz,[Länderverzeichnis für die Außenhandelsstatistik].LandBez  " &
                                      " FROM [Länderverzeichnis für die Außenhandelsstatistik] LEFT JOIN [Währungstabelle] ON [Länderverzeichnis für die Außenhandelsstatistik].LandNr = [Währungstabelle].[Währungsschlüssel] " &
-                                      " WHERE [Währungstabelle].[MitgliedslandEU] = 1 " &
+                                      " WHERE ([Währungstabelle].[MitgliedslandEU] = 1) " &
                                      " ORDER BY [Länderverzeichnis für die Außenhandelsstatistik].LandKz ", , "FMZOLL", True)
        '  cbxLandKz.fillWithSQL(" SELECT [Länderverzeichnis für die Außenhandelsstatistik].LandKz,[Länderverzeichnis für die Außenhandelsstatistik].LandBez  " & _
        '                               " FROM [Länderverzeichnis für die Außenhandelsstatistik] LEFT JOIN [Währungstabelle] ON [Länderverzeichnis für die Außenhandelsstatistik].LandNr = [Währungstabelle].[Währungsschlüssel] " & _
@@ -686,6 +696,11 @@ Public Class usrcntlKundeBearbeitenFull
        cbxLandKz.fillWithSQL(" select distinct landkz, Währungstabelle.Land  from   Währungstabelle  where landkz is not null  order by LandKz", , "FMZOLL", True)


+        cboRechnungSprache.Items.Clear()
+        cboRechnungSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Deutsch", "DE"))
+        cboRechnungSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Englisch", "EN"))
+        cboRechnungSprache.changeItem(0)
+
        cboProvisionStaffelArt.fillWithSQL("SELECT [PreislistenNr],[PreislistenBez]  FROM [VERAG].[dbo].[tblPreislisten] WHERE Art='E' ORDER BY Preislistenbez", False, "FMZOLL", True)
        cboFirma.fillWithSQL("SELECT tblFirma.Firma_ID, tblFirma.Firma_Bez FROM tblFirma ORDER BY tblFirma.Firma_ID",  , "FMZOLL", True)