Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

SDL/frmEssensbestellungen.vb

@@ -12,6 +12,8 @@ Public Class frmEssensbestellungen
     Dim menu As String = "Menü"
     Dim alacarte As String = "A la carte"
     Dim outdated As Boolean = False
+    Dim urlaub As String = "urlaub"
+    Dim feiertag As String = "feiertag"
 
 
     Private Sub frmEssensbestellungen_Load(sender As Object, e As EventArgs) Handles MyBase.Load
@@ -46,7 +48,8 @@ Public Class frmEssensbestellungen
             If rbMenu_montag.Checked Then
                 essen.eb_montag = menu
                 setWarning(False)
-            Else
+            ElseIf rbMenuAlt_montag.Checked Then
+
                 If txtAlt_montag.Text.ToString.Replace(" ", "") <> "" Then
                     essen.eb_montag = txtAlt_montag.Text.ToString
                     setWarning(False)
@@ -54,7 +57,8 @@ Public Class frmEssensbestellungen
                     setWarning(True)
                     Exit Sub
                 End If
-
+            Else
+                essen.eb_montag = Nothing
             End If
             setWarning(False)
         Else
@@ -66,7 +70,7 @@ Public Class frmEssensbestellungen
             If rbMenu_dienstag.Checked Then
                 essen.eb_dienstag = menu
                 setWarning(False)
-            Else
+            ElseIf rbMenuAlt_dienstag.Checked Then
                 If txtAlt_dienstag.Text.ToString.Replace(" ", "") <> "" Then
                     essen.eb_dienstag = txtAlt_dienstag.Text.ToString
                     setWarning(False)
@@ -74,6 +78,8 @@ Public Class frmEssensbestellungen
                     setWarning(True)
                     Exit Sub
                 End If
+            Else
+                essen.eb_dienstag = Nothing
             End If
             setWarning(False)
         Else
@@ -84,7 +90,7 @@ Public Class frmEssensbestellungen
             If rbMenu_mittwoch.Checked Then
                 essen.eb_mittwoch = menu
                 setWarning(False)
-            Else
+            ElseIf rbMenuAlt_mittwoch.Checked Then
                 If txtAlt_mittwoch.Text.ToString.Replace(" ", "") <> "" Then
                     essen.eb_mittwoch = txtAlt_mittwoch.Text.ToString
                     setWarning(False)
@@ -92,6 +98,8 @@ Public Class frmEssensbestellungen
                     setWarning(True)
                     Exit Sub
                 End If
+            Else
+                essen.eb_mittwoch = Nothing
             End If
             setWarning(False)
         Else
@@ -102,7 +110,7 @@ Public Class frmEssensbestellungen
             If rbMenu_donnerstag.Checked Then
                 essen.eb_donnerstag = menu
                 setWarning(False)
-            Else
+            ElseIf rbMenuAlt_donnerstag.Checked Then
                 If txtAlt_donnerstag.Text.ToString.Replace(" ", "") <> "" Then
                     essen.eb_donnerstag = txtAlt_donnerstag.Text.ToString
                     setWarning(False)
@@ -110,6 +118,8 @@ Public Class frmEssensbestellungen
                     setWarning(True)
                     Exit Sub
                 End If
+            Else
+                essen.eb_donnerstag = Nothing
             End If
             setWarning(False)
         Else
@@ -120,7 +130,7 @@ Public Class frmEssensbestellungen
             If rbMenu__freitag.Checked Then
                 essen.eb_freitag = menu
                 setWarning(False)
-            Else
+            ElseIf rbMenuAlt_freitag.Checked Then
                 If txtAlt_freitag.Text.ToString.Replace(" ", "") <> "" Then
                     essen.eb_freitag = txtAlt_freitag.Text.ToString
                     setWarning(False)
@@ -128,6 +138,8 @@ Public Class frmEssensbestellungen
                     setWarning(True)
                     Exit Sub
                 End If
+            Else
+                essen.eb_freitag = Nothing
             End If
             setWarning(False)
         Else
@@ -227,63 +239,81 @@ Public Class frmEssensbestellungen
     End Sub
 
     Private Sub cbFields_CheckedChanged(sender As Object, e As EventArgs) Handles cb_montag.CheckedChanged, cb_dienstag.CheckedChanged, cb_mittwoch.CheckedChanged, cbdonnerstag.CheckedChanged, cb_freitag.CheckedChanged
+
+
         If cb_montag.Checked Then
-            rbMenuAlt_montag.Enabled = True
-            rbMenu_montag.Enabled = True
-            If checkIfGroupBoxIsSetFirstTime(GroupBoxMontag) Then
-                rbMenu_montag.Checked = True
+            If Not txtMenu_montag.Text.ToLower.StartsWith(urlaub) AndAlso Not txtMenu_montag.Text.ToLower.StartsWith(feiertag) Then
+                rbMenuAlt_montag.Enabled = True
+                rbMenu_montag.Enabled = True
+                If checkIfGroupBoxIsSetFirstTime(GroupBoxMontag) Then
+                    rbMenu_montag.Checked = True
+                End If
             End If
+
         Else
             rbMenuAlt_montag.Enabled = False
             rbMenu_montag.Enabled = False
             txtAlt_montag.Text = ""
         End If
 
+
         If cb_dienstag.Checked Then
-            rbMenuAlt_dienstag.Enabled = True
-            rbMenu_dienstag.Enabled = True
-            If checkIfGroupBoxIsSetFirstTime(GroupBoxDienstag) Then
-                rbMenu_dienstag.Checked = True
+            If Not txtMenu_dienstag.Text.ToLower.StartsWith(urlaub) AndAlso Not txtMenu_dienstag.Text.ToLower.StartsWith(feiertag) Then
+                rbMenuAlt_dienstag.Enabled = True
+                rbMenu_dienstag.Enabled = True
+                If checkIfGroupBoxIsSetFirstTime(GroupBoxDienstag) Then
+                    rbMenu_dienstag.Checked = True
+                End If
             End If
+
         Else
-            rbMenu_dienstag.Enabled = False
+                rbMenu_dienstag.Enabled = False
             rbMenuAlt_dienstag.Enabled = False
             txtAlt_dienstag.Text = ""
         End If
 
         If cb_mittwoch.Checked Then
-            rbMenuAlt_mittwoch.Enabled = True
-            rbMenu_mittwoch.Enabled = True
-            If checkIfGroupBoxIsSetFirstTime(Mittwoch) Then
-                rbMenu_mittwoch.Checked = True
+            If Not txtMenu_mittwoch.Text.ToLower.StartsWith(urlaub) AndAlso Not txtMenu_mittwoch.Text.ToLower.StartsWith(feiertag) Then
+                rbMenuAlt_mittwoch.Enabled = True
+                rbMenu_mittwoch.Enabled = True
+                If checkIfGroupBoxIsSetFirstTime(Mittwoch) Then
+                    rbMenu_mittwoch.Checked = True
+                End If
             End If
+
         Else
-            rbMenu_mittwoch.Enabled = False
+                rbMenu_mittwoch.Enabled = False
             rbMenuAlt_mittwoch.Enabled = False
             txtAlt_mittwoch.Text = ""
         End If
 
 
         If cbdonnerstag.Checked Then
-            rbMenuAlt_donnerstag.Enabled = True
-            rbMenu_donnerstag.Enabled = True
-            If checkIfGroupBoxIsSetFirstTime(GroupBoxDonnerstag) Then
-                rbMenu_donnerstag.Checked = True
+            If Not txtMenu_donnerstag.Text.ToLower.StartsWith(urlaub) AndAlso Not txtMenu_donnerstag.Text.ToLower.StartsWith(feiertag) Then
+                rbMenuAlt_donnerstag.Enabled = True
+                rbMenu_donnerstag.Enabled = True
+                If checkIfGroupBoxIsSetFirstTime(GroupBoxDonnerstag) Then
+                    rbMenu_donnerstag.Checked = True
+                End If
             End If
+
         Else
-            rbMenu_donnerstag.Enabled = False
+                rbMenu_donnerstag.Enabled = False
             rbMenuAlt_donnerstag.Enabled = False
             txtAlt_donnerstag.Text = ""
         End If
 
         If cb_freitag.Checked Then
-            rbMenuAlt_freitag.Enabled = True
-            rbMenu__freitag.Enabled = True
-            If checkIfGroupBoxIsSetFirstTime(GroupBoxFreitag) Then
-                rbMenu__freitag.Checked = True
+            If Not txtMenu_freitag.Text.ToLower.StartsWith(urlaub) AndAlso Not txtMenu_freitag.Text.ToLower.StartsWith(feiertag) Then
+                rbMenuAlt_freitag.Enabled = True
+                rbMenu__freitag.Enabled = True
+                If checkIfGroupBoxIsSetFirstTime(GroupBoxFreitag) Then
+                    rbMenu__freitag.Checked = True
+                End If
             End If
+
         Else
-            rbMenu__freitag.Enabled = False
+                rbMenu__freitag.Enabled = False
             rbMenuAlt_freitag.Enabled = False
             txtAlt_freitag.Text = ""
         End If

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.cbxVerzolltBeiExport = New System.Windows.Forms.CheckBox()
@@ -318,10 +318,11 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.Button4 = New System.Windows.Forms.Button()
         Me.CheckBox1 = New System.Windows.Forms.CheckBox()
         Me.txtERROR = New System.Windows.Forms.TextBox()
-        Me.Button5 = New System.Windows.Forms.Button()
+        Me.btnDatevExport = New System.Windows.Forms.Button()
         Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.cboAuswahl = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.Label98 = New System.Windows.Forms.Label()
         Me.tbcntrDetails.SuspendLayout()
         Me.tbAbfertigung.SuspendLayout()
         Me.tbcntrAbf.SuspendLayout()
@@ -2562,8 +2563,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)
@@ -2662,8 +2663,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)
@@ -2823,41 +2824,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)
@@ -2997,8 +2998,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)
@@ -3219,8 +3220,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)
@@ -3440,8 +3441,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
@@ -3963,9 +3964,9 @@ Partial Class usrcntlKundeBearbeitenFull
         'btnFirmendatenFormularSpeichern
         '
         Me.btnFirmendatenFormularSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnFirmendatenFormularSpeichern.Location = New System.Drawing.Point(1026, 493)
+        Me.btnFirmendatenFormularSpeichern.Location = New System.Drawing.Point(1081, 503)
         Me.btnFirmendatenFormularSpeichern.Name = "btnFirmendatenFormularSpeichern"
-        Me.btnFirmendatenFormularSpeichern.Size = New System.Drawing.Size(112, 52)
+        Me.btnFirmendatenFormularSpeichern.Size = New System.Drawing.Size(71, 52)
         Me.btnFirmendatenFormularSpeichern.TabIndex = 16
         Me.btnFirmendatenFormularSpeichern.Text = "Speichern"
         Me.btnFirmendatenFormularSpeichern.UseVisualStyleBackColor = True
@@ -4033,9 +4034,9 @@ Partial Class usrcntlKundeBearbeitenFull
         'Button1
         '
         Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button1.Location = New System.Drawing.Point(585, 509)
+        Me.Button1.Location = New System.Drawing.Point(573, 509)
         Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(126, 38)
+        Me.Button1.Size = New System.Drawing.Size(98, 38)
         Me.Button1.TabIndex = 14
         Me.Button1.Text = "Kundenstamm jetzt übertragen"
         Me.Button1.UseVisualStyleBackColor = True
@@ -4056,7 +4057,7 @@ Partial Class usrcntlKundeBearbeitenFull
         '
         Me.Label29.AutoSize = True
         Me.Label29.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label29.Location = New System.Drawing.Point(582, 493)
+        Me.Label29.Location = New System.Drawing.Point(567, 493)
         Me.Label29.Name = "Label29"
         Me.Label29.Size = New System.Drawing.Size(109, 13)
         Me.Label29.TabIndex = 8
@@ -4141,9 +4142,9 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.pnlNeukunde.Controls.Add(Me.cboFiliale)
         Me.pnlNeukunde.Controls.Add(Me.cboKundenkreis)
         Me.pnlNeukunde.Controls.Add(Me.Label68)
-        Me.pnlNeukunde.Location = New System.Drawing.Point(717, 487)
+        Me.pnlNeukunde.Location = New System.Drawing.Point(776, 493)
         Me.pnlNeukunde.Name = "pnlNeukunde"
-        Me.pnlNeukunde.Size = New System.Drawing.Size(303, 80)
+        Me.pnlNeukunde.Size = New System.Drawing.Size(303, 74)
         Me.pnlNeukunde.TabIndex = 15
         Me.pnlNeukunde.Visible = False
         '
@@ -4194,7 +4195,7 @@ Partial Class usrcntlKundeBearbeitenFull
         '
         Me.Label77.AutoSize = True
         Me.Label77.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label77.Location = New System.Drawing.Point(731, 534)
+        Me.Label77.Location = New System.Drawing.Point(780, 534)
         Me.Label77.Name = "Label77"
         Me.Label77.Size = New System.Drawing.Size(64, 13)
         Me.Label77.TabIndex = 6
@@ -4204,7 +4205,7 @@ Partial Class usrcntlKundeBearbeitenFull
         '
         Me.lblKundennr.AutoSize = True
         Me.lblKundennr.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblKundennr.Location = New System.Drawing.Point(801, 532)
+        Me.lblKundennr.Location = New System.Drawing.Point(850, 532)
         Me.lblKundennr.Name = "lblKundennr"
         Me.lblKundennr.Size = New System.Drawing.Size(14, 17)
         Me.lblKundennr.TabIndex = 7
@@ -4214,7 +4215,7 @@ Partial Class usrcntlKundeBearbeitenFull
         '
         Me.Label79.AutoSize = True
         Me.Label79.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label79.Location = New System.Drawing.Point(731, 504)
+        Me.Label79.Location = New System.Drawing.Point(780, 504)
         Me.Label79.Name = "Label79"
         Me.Label79.Size = New System.Drawing.Size(40, 13)
         Me.Label79.TabIndex = 4
@@ -4271,7 +4272,7 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button4.Location = New System.Drawing.Point(466, 509)
         Me.Button4.Name = "Button4"
-        Me.Button4.Size = New System.Drawing.Size(113, 38)
+        Me.Button4.Size = New System.Drawing.Size(101, 38)
         Me.Button4.TabIndex = 21
         Me.Button4.Text = "Kundenstamm jetzt übertragen"
         Me.Button4.UseVisualStyleBackColor = True
@@ -4304,16 +4305,16 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.txtERROR.Size = New System.Drawing.Size(443, 30)
         Me.txtERROR.TabIndex = 17
         '
-        'Button5
+        'btnDatevExport
         '
-        Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button5.Location = New System.Drawing.Point(1067, 547)
-        Me.Button5.Name = "Button5"
-        Me.Button5.Size = New System.Drawing.Size(51, 23)
-        Me.Button5.TabIndex = 23
-        Me.Button5.Text = "Datev"
-        Me.Button5.UseVisualStyleBackColor = True
-        Me.Button5.Visible = False
+        Me.btnDatevExport.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnDatevExport.Location = New System.Drawing.Point(678, 509)
+        Me.btnDatevExport.Name = "btnDatevExport"
+        Me.btnDatevExport.Size = New System.Drawing.Size(93, 38)
+        Me.btnDatevExport.TabIndex = 23
+        Me.btnDatevExport.Text = "Kundenstamm jetzt übertragen"
+        Me.btnDatevExport.UseVisualStyleBackColor = True
+        Me.btnDatevExport.Visible = False
         '
         'cboFirma
         '
@@ -4344,7 +4345,7 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.cboAuswahl.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.cboAuswahl.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.cboAuswahl.FormattingEnabled = True
-        Me.cboAuswahl.Location = New System.Drawing.Point(777, 496)
+        Me.cboAuswahl.Location = New System.Drawing.Point(826, 496)
         Me.cboAuswahl.Name = "cboAuswahl"
         Me.cboAuswahl.Size = New System.Drawing.Size(124, 28)
         Me.cboAuswahl.TabIndex = 5
@@ -4355,12 +4356,24 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.DataGridViewTextBoxColumn2.HeaderText = "E-Mail"
         Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2"
         '
+        'Label98
+        '
+        Me.Label98.AutoSize = True
+        Me.Label98.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label98.Location = New System.Drawing.Point(675, 493)
+        Me.Label98.Name = "Label98"
+        Me.Label98.Size = New System.Drawing.Size(101, 13)
+        Me.Label98.TabIndex = 24
+        Me.Label98.Text = "Übertrag in DATEV:"
+        Me.Label98.Visible = False
+        '
         'usrcntlKundeBearbeitenFull
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.BackColor = System.Drawing.Color.White
-        Me.Controls.Add(Me.Button5)
+        Me.Controls.Add(Me.Label98)
+        Me.Controls.Add(Me.btnDatevExport)
         Me.Controls.Add(Me.CheckBox1)
         Me.Controls.Add(Me.Button4)
         Me.Controls.Add(Me.cbxFiBuLG)
@@ -4731,5 +4744,6 @@ Partial Class usrcntlKundeBearbeitenFull
     Friend WithEvents cboFremdspeditionExport As System.Windows.Forms.ComboBox
     Friend WithEvents FlowLayoutPanel1 As FlowLayoutPanel
     Friend WithEvents Panel1 As Panel
-    Friend WithEvents Button5 As Button
+    Friend WithEvents btnDatevExport As Button
+    Friend WithEvents Label98 As Label
 End Class

SDL/kunden/usrcntlKundeBearbeitenFull.vb

@@ -1079,10 +1079,12 @@ Public Class usrcntlKundeBearbeitenFull
             cboFiliale.changeItem(Filiale)
         End If
 
-        If VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "DANIEL" Then
-            Button5.Visible = True
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("DATEV_EXPORT", "SDL") Then
+            Label98.Visible = True
+            btnDatevExport.Visible = True
         Else
-            Button5.Visible = False
+            Label98.Visible = False
+            btnDatevExport.Visible = False
         End If
 
     End Sub
@@ -1447,8 +1449,10 @@ Public Class usrcntlKundeBearbeitenFull
 
     End Sub
 
-    Private Sub Button5_Click_2(sender As Object, e As EventArgs) Handles Button5.Click
-        VERAG_PROG_ALLGEMEIN.cDatev_Interface.genDatensatzCSV_ALL(False, True, True)
+    Private Sub btnDatevExport_Click(sender As Object, e As EventArgs) Handles btnDatevExport.Click
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("DATEV_EXPORT", "SDL") Then
+            VERAG_PROG_ALLGEMEIN.cDatev_Interface.genDatensatzCSV_ALL(False, True, False)
+        End If
 
     End Sub
 End Class

VERAG_PROG_ALLGEMEIN/Schnittstellen/cDatev_Interface.vb

@@ -185,9 +185,9 @@
             Dim path = "\\datenarchiv.verag.ost.dmn\DATENARCHIV\DATENARCHIV_TESTSYSTEM\INTERFACE\DATEV\AR-DATEN\" & Geschaeftsjahr & "\"
             '   path = pathArchiv 'TEST
             If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
-                    'path = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir
-                    'pathArchiv = ""
-                End If
+                pathArchiv = "\\datenarchiv.verag.ost.dmn\DATENARCHIV\DATENARCHIV_TESTSYSTEM\INTERFACE\DATEV\ARCHIV\AR-DATEN\"
+                path = "\\datenarchiv.verag.ost.dmn\DATENARCHIV\DATENARCHIV_TESTSYSTEM\INTERFACE\DATEV\AR-DATEN\" & Geschaeftsjahr & "\"
+            End If
                 If Not IO.Directory.Exists(path) Then IO.Directory.CreateDirectory(path)
                 If Not IO.Directory.Exists(pathArchiv) Then IO.Directory.CreateDirectory(pathArchiv)
             '-------------------------------------------------------------------------------------------
@@ -195,8 +195,8 @@
             Dim NameZusatz = ""
                 Dim Buchungsjahr = -1
                 Select Case FIRMA.Firma_ID
-                    Case 21 : NameZusatz = "UNISPED_AT_" : Buchungsjahr = Geschaeftsjahr
-                    Case 22 : NameZusatz = "UNISPED_DE_" : Buchungsjahr = Geschaeftsjahr
+                Case 21 : NameZusatz = "UNISPED_AT_" : Buchungsjahr = Geschaeftsjahr
+                Case 22 : NameZusatz = "UNISPED_DE_" : Buchungsjahr = Geschaeftsjahr
                 Case 23 : NameZusatz = "UNISPED_ZS_" : Buchungsjahr = Geschaeftsjahr
                 Case 24 : NameZusatz = "AMBAR_DE_" : Buchungsjahr = Geschaeftsjahr
             End Select