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

This commit is contained in:
2024-12-04 11:55:58 +01:00
12 changed files with 177 additions and 148 deletions

View File

@@ -244,6 +244,9 @@ 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.txtSumVerag = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.txtSonst_KdNrVerag = New System.Windows.Forms.TextBox()
Me.Label110 = New System.Windows.Forms.Label()
Me.txtSumPLOSE = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.txtSumUTA = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.txtSumMSE = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -376,9 +379,6 @@ Partial Class usrcntlKundeBearbeitenFull
Me.ArchivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.DokumentHinzufügenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.DokumentLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.Label110 = New System.Windows.Forms.Label()
Me.txtSonst_KdNrVerag = New System.Windows.Forms.TextBox()
Me.txtSumVerag = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.tbcntrDetails.SuspendLayout()
Me.tbAbfertigung.SuspendLayout()
Me.tbcntrAbf.SuspendLayout()
@@ -3514,6 +3514,48 @@ Partial Class usrcntlKundeBearbeitenFull
Me.tbSonstiges.Text = "Sonstiges"
Me.tbSonstiges.UseVisualStyleBackColor = True
'
'txtSumVerag
'
Me.txtSumVerag._DateTimeOnly = False
Me.txtSumVerag._numbersOnly = True
Me.txtSumVerag._numbersOnlyKommastellen = ""
Me.txtSumVerag._numbersOnlyTrennzeichen = True
Me.txtSumVerag._Prozent = False
Me.txtSumVerag._ShortDateNew = False
Me.txtSumVerag._ShortDateOnly = False
Me.txtSumVerag._TimeOnly = False
Me.txtSumVerag._TimeOnly_Seconds = False
Me.txtSumVerag._value = ""
Me.txtSumVerag._Waehrung = False
Me.txtSumVerag._WaehrungZeichen = True
Me.txtSumVerag.ForeColor = System.Drawing.Color.Black
Me.txtSumVerag.Location = New System.Drawing.Point(254, 230)
Me.txtSumVerag.MaxLineLength = -1
Me.txtSumVerag.MaxLines_Warning = ""
Me.txtSumVerag.MaxLines_Warning_Label = Nothing
Me.txtSumVerag.Name = "txtSumVerag"
Me.txtSumVerag.Size = New System.Drawing.Size(100, 20)
Me.txtSumVerag.TabIndex = 32
'
'txtSonst_KdNrVerag
'
Me.txtSonst_KdNrVerag.Location = New System.Drawing.Point(119, 231)
Me.txtSonst_KdNrVerag.MaxLength = 20
Me.txtSonst_KdNrVerag.Name = "txtSonst_KdNrVerag"
Me.txtSonst_KdNrVerag.Size = New System.Drawing.Size(122, 20)
Me.txtSonst_KdNrVerag.TabIndex = 31
'
'Label110
'
Me.Label110.AutoSize = True
Me.Label110.Enabled = False
Me.Label110.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label110.Location = New System.Drawing.Point(6, 233)
Me.Label110.Name = "Label110"
Me.Label110.Size = New System.Drawing.Size(82, 13)
Me.Label110.TabIndex = 30
Me.Label110.Text = "KdNr bei Verag:"
'
'txtSumPLOSE
'
Me.txtSumPLOSE._DateTimeOnly = False
@@ -5129,48 +5171,6 @@ Partial Class usrcntlKundeBearbeitenFull
Me.DokumentLöschenToolStripMenuItem.Size = New System.Drawing.Size(193, 22)
Me.DokumentLöschenToolStripMenuItem.Text = "Dokument löschen"
'
'Label110
'
Me.Label110.AutoSize = True
Me.Label110.Enabled = False
Me.Label110.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label110.Location = New System.Drawing.Point(6, 233)
Me.Label110.Name = "Label110"
Me.Label110.Size = New System.Drawing.Size(82, 13)
Me.Label110.TabIndex = 30
Me.Label110.Text = "KdNr bei Verag:"
'
'txtSonst_KdNrVerag
'
Me.txtSonst_KdNrVerag.Location = New System.Drawing.Point(119, 231)
Me.txtSonst_KdNrVerag.MaxLength = 20
Me.txtSonst_KdNrVerag.Name = "txtSonst_KdNrVerag"
Me.txtSonst_KdNrVerag.Size = New System.Drawing.Size(122, 20)
Me.txtSonst_KdNrVerag.TabIndex = 31
'
'txtSumVerag
'
Me.txtSumVerag._DateTimeOnly = False
Me.txtSumVerag._numbersOnly = True
Me.txtSumVerag._numbersOnlyKommastellen = ""
Me.txtSumVerag._numbersOnlyTrennzeichen = True
Me.txtSumVerag._Prozent = False
Me.txtSumVerag._ShortDateNew = False
Me.txtSumVerag._ShortDateOnly = False
Me.txtSumVerag._TimeOnly = False
Me.txtSumVerag._TimeOnly_Seconds = False
Me.txtSumVerag._value = ""
Me.txtSumVerag._Waehrung = False
Me.txtSumVerag._WaehrungZeichen = True
Me.txtSumVerag.ForeColor = System.Drawing.Color.Black
Me.txtSumVerag.Location = New System.Drawing.Point(254, 230)
Me.txtSumVerag.MaxLineLength = -1
Me.txtSumVerag.MaxLines_Warning = ""
Me.txtSumVerag.MaxLines_Warning_Label = Nothing
Me.txtSumVerag.Name = "txtSumVerag"
Me.txtSumVerag.Size = New System.Drawing.Size(100, 20)
Me.txtSumVerag.TabIndex = 32
'
'usrcntlKundeBearbeitenFull
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

View File

@@ -1970,7 +1970,7 @@ Public Class usrcntlKundeBearbeitenFull
.DataSource.Columns("AdressenNr").DefaultValue = KUNDE.KundenNr
.DataSource.Columns("UStV").DefaultValue = False
.DataSource.Columns("UStV").DefaultValue = True
.Columns(0).Visible = False