Merge branch 'newMaster2024' of https://dev.azure.com/VeragAG/_git/SDL into newMaster2024

SDL/kunden/usrCntlKundenBesonderheiten.Designer.vb

@@ -39,6 +39,7 @@ Partial Class usrCntlKundenBesonderheiten
         Me.BearbetienToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.LöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
         Me.pnl.SuspendLayout()
         CType(Me.dgvBesonderheiten, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel1.SuspendLayout()
@@ -63,6 +64,7 @@ Partial Class usrCntlKundenBesonderheiten
         DataGridViewCellStyle1.BackColor = System.Drawing.Color.White
         DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
         Me.dgvBesonderheiten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        Me.dgvBesonderheiten.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells
         Me.dgvBesonderheiten.BackgroundColor = System.Drawing.Color.White
         Me.dgvBesonderheiten.BorderStyle = System.Windows.Forms.BorderStyle.None
         DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
@@ -80,7 +82,7 @@ Partial Class usrCntlKundenBesonderheiten
         DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText
         DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
         DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
         Me.dgvBesonderheiten.DefaultCellStyle = DataGridViewCellStyle3
         Me.dgvBesonderheiten.Dock = System.Windows.Forms.DockStyle.Fill
         Me.dgvBesonderheiten.Location = New System.Drawing.Point(0, 0)
@@ -224,4 +226,5 @@ Partial Class usrCntlKundenBesonderheiten
     Friend WithEvents LöschenToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
     Friend WithEvents btn As Button
+    Friend WithEvents ToolTip1 As ToolTip
 End Class

SDL/kunden/usrCntlKundenBesonderheiten.resx

@@ -123,4 +123,7 @@
   <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>95, 17</value>
   </metadata>
+  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>252, 17</value>
+  </metadata>
 </root>

SDL/kunden/usrCntlKundenBesonderheiten.vb

@@ -124,6 +124,7 @@ Public Class usrCntlKundenBesonderheiten
             .ClearSelection()
             .AutoSizeRowsMode = DataGridViewAutoSizeRowsMode.AllCells
 
+
             .Columns("kdb_id").Visible = False
             .Columns("kdb_hervorheben").Visible = False
             .Columns("kdb_EingetragenAm").Visible = False
@@ -135,6 +136,7 @@ Public Class usrCntlKundenBesonderheiten
 
             .Columns("kdb_text").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
             .Columns("kdb_text").HeaderText = "Text"
+            .Columns("kdb_text").DefaultCellStyle.WrapMode = DataGridViewTriState.True
 
             .Columns("kdb_mitName").Width = 60
             .Columns("kdb_mitName").HeaderText = "SB"
@@ -183,6 +185,14 @@ Public Class usrCntlKundenBesonderheiten
     End Sub
 
 
+
+    'Private Sub DataGridView1_EditingControlShowing(sender As Object, e As DataGridViewEditingControlShowingEventArgs) Handles dgvBesonderheiten.EditingControlShowing
+    '    Dim tb As TextBox = TryCast(e.Control, TextBox)
+    '    If tb IsNot Nothing Then
+    '        tb.Multiline = True
+    '        tb.ScrollBars = ScrollBars.Vertical
+    '    End If
+    'End Sub
     Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click
         Dim f As New frmKundenBesonderheiten_Add(kdNr)
         f.ShowDialog()

VERAG_PROG_ALLGEMEIN/Schnittstellen/cDatev_Interface.vb

@@ -442,6 +442,13 @@ Public Class cDatev_Interface
                 BelegKz = "AG"
                 SollHabenKz = Chr(83)
 
+                Select Case row("RechnungsKundenNr")
+                    Case ""
+
+                End Select
+
+
+
             Case Else
                 BelegBez = ""
                 BelegKz = ""