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

Aviso/Anhänge/frmSendungAnhangImport.Designer.vb

@@ -26,6 +26,8 @@ Partial Class frmSendungAnhangImport
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSendungAnhangImport))
         Me.lbl = New System.Windows.Forms.Label()
         Me.flpnlAviso = New System.Windows.Forms.FlowLayoutPanel()
+        Me.UsrCntlSendungAnhangElement1 = New AVISO.usrCntlSendungAnhangElement()
+        Me.UsrCntlSendungAnhangElement2 = New AVISO.usrCntlSendungAnhangElement()
         Me.flpnlSendungen = New System.Windows.Forms.FlowLayoutPanel()
         Me.lblSendungen = New System.Windows.Forms.Label()
         Me.lblImport = New System.Windows.Forms.Label()
@@ -69,8 +71,6 @@ Partial Class frmSendungAnhangImport
         Me.Panel1 = New System.Windows.Forms.Panel()
         Me.Button17 = New System.Windows.Forms.Button()
         Me.lblRgPreis = New System.Windows.Forms.Label()
-        Me.UsrCntlSendungAnhangElement1 = New AVISO.usrCntlSendungAnhangElement()
-        Me.UsrCntlSendungAnhangElement2 = New AVISO.usrCntlSendungAnhangElement()
         Me.flpnlAviso.SuspendLayout()
         Me.pnlAnfuegen.SuspendLayout()
         Me.cntxt.SuspendLayout()
@@ -101,6 +101,36 @@ Partial Class frmSendungAnhangImport
         Me.flpnlAviso.Size = New System.Drawing.Size(200, 825)
         Me.flpnlAviso.TabIndex = 7
         '
+        'UsrCntlSendungAnhangElement1
+        '
+        Me.UsrCntlSendungAnhangElement1.ACTIVE = False
+        Me.UsrCntlSendungAnhangElement1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlSendungAnhangElement1.FILE_ANHID = Nothing
+        Me.UsrCntlSendungAnhangElement1.FILE_DOCID = Nothing
+        Me.UsrCntlSendungAnhangElement1.FILE_NAME = "False"
+        Me.UsrCntlSendungAnhangElement1.FILE_PAGES = Nothing
+        Me.UsrCntlSendungAnhangElement1.FILE_PATH = Nothing
+        Me.UsrCntlSendungAnhangElement1.FILE_TYPE = Nothing
+        Me.UsrCntlSendungAnhangElement1.Location = New System.Drawing.Point(3, 3)
+        Me.UsrCntlSendungAnhangElement1.Name = "UsrCntlSendungAnhangElement1"
+        Me.UsrCntlSendungAnhangElement1.Size = New System.Drawing.Size(130, 64)
+        Me.UsrCntlSendungAnhangElement1.TabIndex = 0
+        '
+        'UsrCntlSendungAnhangElement2
+        '
+        Me.UsrCntlSendungAnhangElement2.ACTIVE = False
+        Me.UsrCntlSendungAnhangElement2.BackColor = System.Drawing.Color.White
+        Me.UsrCntlSendungAnhangElement2.FILE_ANHID = Nothing
+        Me.UsrCntlSendungAnhangElement2.FILE_DOCID = Nothing
+        Me.UsrCntlSendungAnhangElement2.FILE_NAME = "False"
+        Me.UsrCntlSendungAnhangElement2.FILE_PAGES = Nothing
+        Me.UsrCntlSendungAnhangElement2.FILE_PATH = Nothing
+        Me.UsrCntlSendungAnhangElement2.FILE_TYPE = Nothing
+        Me.UsrCntlSendungAnhangElement2.Location = New System.Drawing.Point(3, 73)
+        Me.UsrCntlSendungAnhangElement2.Name = "UsrCntlSendungAnhangElement2"
+        Me.UsrCntlSendungAnhangElement2.Size = New System.Drawing.Size(130, 64)
+        Me.UsrCntlSendungAnhangElement2.TabIndex = 1
+        '
         'flpnlSendungen
         '
         Me.flpnlSendungen.AllowDrop = True
@@ -187,6 +217,7 @@ Partial Class frmSendungAnhangImport
         Me.txtBezeichnung._DateTimeOnly = False
         Me.txtBezeichnung._numbersOnly = False
         Me.txtBezeichnung._numbersOnlyKommastellen = ""
+        Me.txtBezeichnung._numbersOnlyTrennzeichen = True
         Me.txtBezeichnung._Prozent = False
         Me.txtBezeichnung._ShortDateNew = False
         Me.txtBezeichnung._ShortDateOnly = False
@@ -242,6 +273,7 @@ Partial Class frmSendungAnhangImport
         Me.txtDateiname._DateTimeOnly = False
         Me.txtDateiname._numbersOnly = False
         Me.txtDateiname._numbersOnlyKommastellen = ""
+        Me.txtDateiname._numbersOnlyTrennzeichen = True
         Me.txtDateiname._Prozent = False
         Me.txtDateiname._ShortDateNew = False
         Me.txtDateiname._ShortDateOnly = False
@@ -274,6 +306,7 @@ Partial Class frmSendungAnhangImport
         Me.MyTextBox2._DateTimeOnly = False
         Me.MyTextBox2._numbersOnly = False
         Me.MyTextBox2._numbersOnlyKommastellen = ""
+        Me.MyTextBox2._numbersOnlyTrennzeichen = True
         Me.MyTextBox2._Prozent = False
         Me.MyTextBox2._ShortDateNew = False
         Me.MyTextBox2._ShortDateOnly = False
@@ -340,6 +373,7 @@ Partial Class frmSendungAnhangImport
         Me.txtSeiten._DateTimeOnly = False
         Me.txtSeiten._numbersOnly = False
         Me.txtSeiten._numbersOnlyKommastellen = ""
+        Me.txtSeiten._numbersOnlyTrennzeichen = True
         Me.txtSeiten._Prozent = False
         Me.txtSeiten._ShortDateNew = False
         Me.txtSeiten._ShortDateOnly = False
@@ -613,38 +647,9 @@ Partial Class frmSendungAnhangImport
         Me.lblRgPreis.Text = "-"
         Me.lblRgPreis.TextAlign = System.Drawing.ContentAlignment.TopRight
         '
-        'UsrCntlSendungAnhangElement1
-        '
-        Me.UsrCntlSendungAnhangElement1.ACTIVE = False
-        Me.UsrCntlSendungAnhangElement1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlSendungAnhangElement1.FILE_ANHID = Nothing
-        Me.UsrCntlSendungAnhangElement1.FILE_DOCID = Nothing
-        Me.UsrCntlSendungAnhangElement1.FILE_NAME = "False"
-        Me.UsrCntlSendungAnhangElement1.FILE_PAGES = Nothing
-        Me.UsrCntlSendungAnhangElement1.FILE_PATH = Nothing
-        Me.UsrCntlSendungAnhangElement1.FILE_TYPE = Nothing
-        Me.UsrCntlSendungAnhangElement1.Location = New System.Drawing.Point(3, 3)
-        Me.UsrCntlSendungAnhangElement1.Name = "UsrCntlSendungAnhangElement1"
-        Me.UsrCntlSendungAnhangElement1.Size = New System.Drawing.Size(130, 64)
-        Me.UsrCntlSendungAnhangElement1.TabIndex = 0
-        '
-        'UsrCntlSendungAnhangElement2
-        '
-        Me.UsrCntlSendungAnhangElement2.ACTIVE = False
-        Me.UsrCntlSendungAnhangElement2.BackColor = System.Drawing.Color.White
-        Me.UsrCntlSendungAnhangElement2.FILE_ANHID = Nothing
-        Me.UsrCntlSendungAnhangElement2.FILE_DOCID = Nothing
-        Me.UsrCntlSendungAnhangElement2.FILE_NAME = "False"
-        Me.UsrCntlSendungAnhangElement2.FILE_PAGES = Nothing
-        Me.UsrCntlSendungAnhangElement2.FILE_PATH = Nothing
-        Me.UsrCntlSendungAnhangElement2.FILE_TYPE = Nothing
-        Me.UsrCntlSendungAnhangElement2.Location = New System.Drawing.Point(3, 73)
-        Me.UsrCntlSendungAnhangElement2.Name = "UsrCntlSendungAnhangElement2"
-        Me.UsrCntlSendungAnhangElement2.Size = New System.Drawing.Size(130, 64)
-        Me.UsrCntlSendungAnhangElement2.TabIndex = 1
-        '
         'frmSendungAnhangImport
         '
+        Me.AllowDrop = True
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.BackColor = System.Drawing.Color.White

Aviso/usrcntlAktDetails.vb

@@ -2194,7 +2194,7 @@ Public Class usrcntlAktDetails
                         dgvSendungen.FirstDisplayedScrollingRowIndex = tmpscroll
                     End If
                     loaded = True
-                    'Vermerke_anzeigen()
+                    Vermerke_anzeigen()
 
                 End If
             End If