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

2023-01-17 21:27:59 +01:00
parent 7f2542d37b 6ba1f98505
commit 7f18a2a981
9 changed files with 562 additions and 34 deletions
--- a/SDL/frmEssensbestellungen.Designer.vb
+++ b/SDL/frmEssensbestellungen.Designer.vb
@@ -178,7 +178,7 @@ Partial Class frmEssensbestellungen
        'lblBestellungen
        '
        Me.lblBestellungen.AutoSize = True
-        Me.lblBestellungen.Location = New System.Drawing.Point(15, 385)
+        Me.lblBestellungen.Location = New System.Drawing.Point(12, 399)
        Me.lblBestellungen.Name = "lblBestellungen"
        Me.lblBestellungen.Size = New System.Drawing.Size(100, 13)
        Me.lblBestellungen.TabIndex = 20
@@ -198,7 +198,7 @@ Partial Class frmEssensbestellungen
        Me.cbxGebauede._allowedValuesFreiText = Nothing
        Me.cbxGebauede._allowFreiText = True
        Me.cbxGebauede._value = ""
-        Me.cbxGebauede.DropDownWidth = 100
+        Me.cbxGebauede.DropDownWidth = 120
        Me.cbxGebauede.FormattingEnabled = True
        Me.cbxGebauede.Location = New System.Drawing.Point(580, 89)
        Me.cbxGebauede.Name = "cbxGebauede"
@@ -269,7 +269,7 @@ Partial Class frmEssensbestellungen
        '
        'txtMenu_dienstag
        '
-        Me.txtMenu_dienstag.Location = New System.Drawing.Point(0, 39)
+        Me.txtMenu_dienstag.Location = New System.Drawing.Point(3, 39)
        Me.txtMenu_dienstag.Name = "txtMenu_dienstag"
        Me.txtMenu_dienstag.Size = New System.Drawing.Size(188, 32)
        Me.txtMenu_dienstag.TabIndex = 30
@@ -311,7 +311,7 @@ Partial Class frmEssensbestellungen
        Me.txtAlt_dienstag._Waehrung = False
        Me.txtAlt_dienstag._WaehrungZeichen = True
        Me.txtAlt_dienstag.ForeColor = System.Drawing.Color.Black
-        Me.txtAlt_dienstag.Location = New System.Drawing.Point(0, 93)
+        Me.txtAlt_dienstag.Location = New System.Drawing.Point(3, 93)
        Me.txtAlt_dienstag.MaxLineLength = -1
        Me.txtAlt_dienstag.MaxLines_Warning = ""
        Me.txtAlt_dienstag.MaxLines_Warning_Label = Nothing
@@ -380,7 +380,7 @@ Partial Class frmEssensbestellungen
        '
        'txtMenu_montag
        '
-        Me.txtMenu_montag.Location = New System.Drawing.Point(6, 39)
+        Me.txtMenu_montag.Location = New System.Drawing.Point(3, 39)
        Me.txtMenu_montag.Name = "txtMenu_montag"
        Me.txtMenu_montag.Size = New System.Drawing.Size(188, 32)
        Me.txtMenu_montag.TabIndex = 29
@@ -435,7 +435,7 @@ Partial Class frmEssensbestellungen
        '
        Me.rbMenuAlt_montag.AutoSize = True
        Me.rbMenuAlt_montag.GroupName = "GroupBox1"
-        Me.rbMenuAlt_montag.Location = New System.Drawing.Point(6, 74)
+        Me.rbMenuAlt_montag.Location = New System.Drawing.Point(3, 74)
        Me.rbMenuAlt_montag.Name = "rbMenuAlt_montag"
        Me.rbMenuAlt_montag.Size = New System.Drawing.Size(70, 17)
        Me.rbMenuAlt_montag.TabIndex = 1
@@ -514,7 +514,7 @@ Partial Class frmEssensbestellungen
        Me.txtAlt_freitag._Waehrung = False
        Me.txtAlt_freitag._WaehrungZeichen = True
        Me.txtAlt_freitag.ForeColor = System.Drawing.Color.Black
-        Me.txtAlt_freitag.Location = New System.Drawing.Point(-3, 97)
+        Me.txtAlt_freitag.Location = New System.Drawing.Point(3, 97)
        Me.txtAlt_freitag.MaxLineLength = -1
        Me.txtAlt_freitag.MaxLines_Warning = ""
        Me.txtAlt_freitag.MaxLines_Warning_Label = Nothing
@@ -527,7 +527,7 @@ Partial Class frmEssensbestellungen
        '
        Me.rbMenuAlt_freitag.AutoSize = True
        Me.rbMenuAlt_freitag.GroupName = "Freitag"
-        Me.rbMenuAlt_freitag.Location = New System.Drawing.Point(0, 78)
+        Me.rbMenuAlt_freitag.Location = New System.Drawing.Point(3, 78)
        Me.rbMenuAlt_freitag.Name = "rbMenuAlt_freitag"
        Me.rbMenuAlt_freitag.Size = New System.Drawing.Size(70, 17)
        Me.rbMenuAlt_freitag.TabIndex = 1
@@ -582,7 +582,7 @@ Partial Class frmEssensbestellungen
        '
        'txtMenu_mittwoch
        '
-        Me.txtMenu_mittwoch.Location = New System.Drawing.Point(0, 39)
+        Me.txtMenu_mittwoch.Location = New System.Drawing.Point(3, 39)
        Me.txtMenu_mittwoch.Name = "txtMenu_mittwoch"
        Me.txtMenu_mittwoch.Size = New System.Drawing.Size(188, 32)
        Me.txtMenu_mittwoch.TabIndex = 31
@@ -624,7 +624,7 @@ Partial Class frmEssensbestellungen
        Me.txtAlt_mittwoch._Waehrung = False
        Me.txtAlt_mittwoch._WaehrungZeichen = True
        Me.txtAlt_mittwoch.ForeColor = System.Drawing.Color.Black
-        Me.txtAlt_mittwoch.Location = New System.Drawing.Point(0, 93)
+        Me.txtAlt_mittwoch.Location = New System.Drawing.Point(3, 93)
        Me.txtAlt_mittwoch.MaxLineLength = -1
        Me.txtAlt_mittwoch.MaxLines_Warning = ""
        Me.txtAlt_mittwoch.MaxLines_Warning_Label = Nothing
@@ -716,7 +716,7 @@ Partial Class frmEssensbestellungen
        Me.txtAlt_donnerstag._Waehrung = False
        Me.txtAlt_donnerstag._WaehrungZeichen = True
        Me.txtAlt_donnerstag.ForeColor = System.Drawing.Color.Black
-        Me.txtAlt_donnerstag.Location = New System.Drawing.Point(1, 97)
+        Me.txtAlt_donnerstag.Location = New System.Drawing.Point(3, 97)
        Me.txtAlt_donnerstag.MaxLineLength = -1
        Me.txtAlt_donnerstag.MaxLines_Warning = ""
        Me.txtAlt_donnerstag.MaxLines_Warning_Label = Nothing
@@ -729,7 +729,7 @@ Partial Class frmEssensbestellungen
        '
        Me.rbMenuAlt_donnerstag.AutoSize = True
        Me.rbMenuAlt_donnerstag.GroupName = "Donnerstag"
-        Me.rbMenuAlt_donnerstag.Location = New System.Drawing.Point(4, 78)
+        Me.rbMenuAlt_donnerstag.Location = New System.Drawing.Point(3, 78)
        Me.rbMenuAlt_donnerstag.Name = "rbMenuAlt_donnerstag"
        Me.rbMenuAlt_donnerstag.Size = New System.Drawing.Size(70, 17)
        Me.rbMenuAlt_donnerstag.TabIndex = 1
--- a/SDL/frmEssensbestellungen.vb
+++ b/SDL/frmEssensbestellungen.vb
@@ -365,12 +365,12 @@ Public Class frmEssensbestellungen
            If TypeOf gb Is GroupBox Then
                For Each c As Control In gb.Controls

-                    If c.Text.ToLower.StartsWith("menü") AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton AndAlso c.Enabled = True Then
+                    If c.Text.ToLower.StartsWith(menu.ToLower) AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton AndAlso c.Enabled = True Then
                        Dim rb As VERAG_PROG_ALLGEMEIN.MyRadioButton = c
                        If rb.Checked Then countMenus = countMenus + 1
                    End If

-                    If c.Text.ToLower.StartsWith("a la carte") AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton AndAlso c.Enabled = True Then
+                    If c.Text.ToLower.StartsWith(alacarte.ToLower) AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton AndAlso c.Enabled = True Then
                        Dim rb As VERAG_PROG_ALLGEMEIN.MyRadioButton = c
                        If rb.Checked Then countlaCarte = countlaCarte + 1
                    End If
@@ -503,7 +503,7 @@ Public Class frmEssensbestellungen
                rbMenu__freitag.Checked = True
            Else
                rbMenuAlt_freitag.Checked = True
-                If currentEssen.eb_freitag IsNot Nothing Then txtAlt_donnerstag.Text = currentEssen.eb_freitag.ToString
+                If currentEssen.eb_freitag IsNot Nothing Then txtAlt_freitag.Text = currentEssen.eb_freitag.ToString
            End If
        Else
            cb_freitag.Checked = False
--- a/SDL/kunden/frmKundenblatt.Designer.vb
+++ b/SDL/kunden/frmKundenblatt.Designer.vb
@@ -236,7 +236,7 @@ Partial Class frmKundenblatt
        Me.tbFirmendaten.Location = New System.Drawing.Point(4, 25)
        Me.tbFirmendaten.Name = "tbFirmendaten"
        Me.tbFirmendaten.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbFirmendaten.Size = New System.Drawing.Size(1623, 591)
+        Me.tbFirmendaten.Size = New System.Drawing.Size(1623, 642)
        Me.tbFirmendaten.TabIndex = 3
        Me.tbFirmendaten.Text = "Firmendaten"
        '
@@ -246,7 +246,7 @@ Partial Class frmKundenblatt
        Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill
        Me.Panel4.Location = New System.Drawing.Point(3, 3)
        Me.Panel4.Name = "Panel4"
-        Me.Panel4.Size = New System.Drawing.Size(1617, 585)
+        Me.Panel4.Size = New System.Drawing.Size(1617, 636)
        Me.Panel4.TabIndex = 0
        '
        'UsrcntlKundeBearbeitenFull1
@@ -256,7 +256,7 @@ Partial Class frmKundenblatt
        Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0)
        Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1"
-        Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1617, 585)
+        Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1617, 636)
        Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0
        '
        'tbcntrMain
@@ -273,7 +273,7 @@ Partial Class frmKundenblatt
        Me.tbcntrMain.Margin = New System.Windows.Forms.Padding(0)
        Me.tbcntrMain.Name = "tbcntrMain"
        Me.tbcntrMain.SelectedIndex = 0
-        Me.tbcntrMain.Size = New System.Drawing.Size(1631, 620)
+        Me.tbcntrMain.Size = New System.Drawing.Size(1631, 671)
        Me.tbcntrMain.TabIndex = 3
        '
        'tbAllgemein
@@ -306,7 +306,7 @@ Partial Class frmKundenblatt
        Me.tbAllgemein.Margin = New System.Windows.Forms.Padding(0)
        Me.tbAllgemein.Name = "tbAllgemein"
        Me.tbAllgemein.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbAllgemein.Size = New System.Drawing.Size(1623, 591)
+        Me.tbAllgemein.Size = New System.Drawing.Size(1623, 659)
        Me.tbAllgemein.TabIndex = 0
        Me.tbAllgemein.Text = "Allgemein"
        '
@@ -601,7 +601,7 @@ Partial Class frmKundenblatt
        Me.dgvSperrliste.Location = New System.Drawing.Point(732, 36)
        Me.dgvSperrliste.Name = "dgvSperrliste"
        Me.dgvSperrliste.ReadOnly = True
-        Me.dgvSperrliste.Size = New System.Drawing.Size(828, 481)
+        Me.dgvSperrliste.Size = New System.Drawing.Size(828, 549)
        Me.dgvSperrliste.TabIndex = 23
        '
        'PictureBox2
@@ -655,7 +655,7 @@ Partial Class frmKundenblatt
        Me.tbZoll.Location = New System.Drawing.Point(4, 25)
        Me.tbZoll.Name = "tbZoll"
        Me.tbZoll.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbZoll.Size = New System.Drawing.Size(1623, 591)
+        Me.tbZoll.Size = New System.Drawing.Size(1623, 642)
        Me.tbZoll.TabIndex = 9
        Me.tbZoll.Text = "ZOLL"
        Me.tbZoll.UseVisualStyleBackColor = True
@@ -667,7 +667,7 @@ Partial Class frmKundenblatt
        Me.tbcntrZOLL.Location = New System.Drawing.Point(3, 3)
        Me.tbcntrZOLL.Name = "tbcntrZOLL"
        Me.tbcntrZOLL.SelectedIndex = 0
-        Me.tbcntrZOLL.Size = New System.Drawing.Size(1617, 585)
+        Me.tbcntrZOLL.Size = New System.Drawing.Size(1617, 636)
        Me.tbcntrZOLL.TabIndex = 0
        '
        'tabZoll_Artikel
@@ -675,7 +675,7 @@ Partial Class frmKundenblatt
        Me.tabZoll_Artikel.Location = New System.Drawing.Point(4, 22)
        Me.tabZoll_Artikel.Name = "tabZoll_Artikel"
        Me.tabZoll_Artikel.Padding = New System.Windows.Forms.Padding(3)
-        Me.tabZoll_Artikel.Size = New System.Drawing.Size(1609, 559)
+        Me.tabZoll_Artikel.Size = New System.Drawing.Size(1609, 610)
        Me.tabZoll_Artikel.TabIndex = 1
        Me.tabZoll_Artikel.Text = "Artikel"
        Me.tabZoll_Artikel.UseVisualStyleBackColor = True
@@ -686,7 +686,7 @@ Partial Class frmKundenblatt
        Me.tbMdm.Location = New System.Drawing.Point(4, 25)
        Me.tbMdm.Name = "tbMdm"
        Me.tbMdm.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbMdm.Size = New System.Drawing.Size(1623, 591)
+        Me.tbMdm.Size = New System.Drawing.Size(1623, 642)
        Me.tbMdm.TabIndex = 10
        Me.tbMdm.Text = "MDM"
        Me.tbMdm.UseVisualStyleBackColor = True
@@ -704,7 +704,7 @@ Partial Class frmKundenblatt
        Me.tbcntrMDM.Margin = New System.Windows.Forms.Padding(0)
        Me.tbcntrMDM.Name = "tbcntrMDM"
        Me.tbcntrMDM.SelectedIndex = 0
-        Me.tbcntrMDM.Size = New System.Drawing.Size(1617, 585)
+        Me.tbcntrMDM.Size = New System.Drawing.Size(1617, 636)
        Me.tbcntrMDM.TabIndex = 0
        '
        'tbSDL
@@ -716,7 +716,7 @@ Partial Class frmKundenblatt
        Me.tbSDL.Margin = New System.Windows.Forms.Padding(0)
        Me.tbSDL.Name = "tbSDL"
        Me.tbSDL.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbSDL.Size = New System.Drawing.Size(1609, 559)
+        Me.tbSDL.Size = New System.Drawing.Size(1609, 610)
        Me.tbSDL.TabIndex = 5
        Me.tbSDL.Text = "SDL-Leistungen"
        Me.tbSDL.UseVisualStyleBackColor = True
@@ -734,7 +734,7 @@ Partial Class frmKundenblatt
        Me.dgvSDLLeistungenFull.Name = "dgvSDLLeistungenFull"
        Me.dgvSDLLeistungenFull.ReadOnly = True
        Me.dgvSDLLeistungenFull.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1603, 363)
+        Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1603, 414)
        Me.dgvSDLLeistungenFull.TabIndex = 5
        '
        'Panel6
@@ -838,7 +838,7 @@ Partial Class frmKundenblatt
        Me.Panel5.Controls.Add(Me.lblLetzterSA_SDL)
        Me.Panel5.Controls.Add(Me.rtbVermerke)
        Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.Panel5.Location = New System.Drawing.Point(3, 413)
+        Me.Panel5.Location = New System.Drawing.Point(3, 464)
        Me.Panel5.Name = "Panel5"
        Me.Panel5.Size = New System.Drawing.Size(1603, 143)
        Me.Panel5.TabIndex = 177
@@ -1223,7 +1223,7 @@ Partial Class frmKundenblatt
        Me.usrcntlKarten.Location = New System.Drawing.Point(3, 3)
        Me.usrcntlKarten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.usrcntlKarten.Name = "usrcntlKarten"
-        Me.usrcntlKarten.Size = New System.Drawing.Size(186, 68)
+        Me.usrcntlKarten.Size = New System.Drawing.Size(172, 33)
        Me.usrcntlKarten.TabIndex = 0
        '
        'tbLKW
@@ -1678,7 +1678,7 @@ Partial Class frmKundenblatt
        Me.tbOfferte.Location = New System.Drawing.Point(4, 25)
        Me.tbOfferte.Margin = New System.Windows.Forms.Padding(2)
        Me.tbOfferte.Name = "tbOfferte"
-        Me.tbOfferte.Size = New System.Drawing.Size(1623, 591)
+        Me.tbOfferte.Size = New System.Drawing.Size(1623, 642)
        Me.tbOfferte.TabIndex = 11
        Me.tbOfferte.Text = "Offerte"
        Me.tbOfferte.UseVisualStyleBackColor = True
@@ -1690,7 +1690,7 @@ Partial Class frmKundenblatt
        Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0)
        Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1)
        Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1"
-        Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1623, 591)
+        Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1623, 642)
        Me.UsrCntlOfferte1.TabIndex = 0
        '
        'cntxtExcel
@@ -1809,7 +1809,7 @@ Partial Class frmKundenblatt
        Me.ToolStripMenuItem2.ImageAlign = System.Drawing.ContentAlignment.TopCenter
        Me.ToolStripMenuItem2.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
        Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2"
-        Me.ToolStripMenuItem2.Size = New System.Drawing.Size(99, 70)
+        Me.ToolStripMenuItem2.Size = New System.Drawing.Size(122, 70)
        Me.ToolStripMenuItem2.Text = "Firmendaten"
        Me.ToolStripMenuItem2.TextAlign = System.Drawing.ContentAlignment.BottomCenter
        Me.ToolStripMenuItem2.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
@@ -1957,7 +1957,7 @@ Partial Class frmKundenblatt
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.AutoScroll = True
        Me.BackColor = System.Drawing.Color.White
-        Me.ClientSize = New System.Drawing.Size(1180, 749)
+        Me.ClientSize = New System.Drawing.Size(1180, 800)
        Me.Controls.Add(Me.lblAbfVerb)
        Me.Controls.Add(Me.btnAbfVerb)
        Me.Controls.Add(Me.tbcntrMain)
--- a/SDL/kunden/frmKundenblatt.vb
+++ b/SDL/kunden/frmKundenblatt.vb
@@ -1703,5 +1703,7 @@ Public Class frmKundenblatt
        Dim f As New frmLKW_AnhaengeDatenarchiv(kdNr, LIST)
        f.ShowDialog(Me)
    End Sub
+
+
 End Class

--- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb
+++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb
@@ -321,6 +321,7 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.cboAuswahl = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.txtERROR = New System.Windows.Forms.TextBox()
        Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.Button5 = New System.Windows.Forms.Button()
        Me.tbcntrDetails.SuspendLayout()
        Me.tbAbfertigung.SuspendLayout()
        Me.tbcntrAbf.SuspendLayout()
@@ -4343,11 +4344,23 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.DataGridViewTextBoxColumn2.HeaderText = "E-Mail"
        Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2"
        '
+        'Button5
+        '
+        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
+        '
        '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.CheckBox1)
        Me.Controls.Add(Me.Button4)
        Me.Controls.Add(Me.cbxFiBuLG)
@@ -4718,4 +4731,5 @@ 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
 End Class
--- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb
+++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb
@@ -1439,4 +1439,9 @@ 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)
+
+    End Sub
 End Class