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

SDL/Fakturierung/cFakturierung.vb

@@ -3986,10 +3986,15 @@ Public Class cFakturierung
         'rpt.lblLKWId.Text = If(RECHNUNG.AvisoID, "")
 
         Dim sachbearbeiterAufRechnung = getSBRgName(Row("Firma_ID"), VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME)
-        rpt.lblSachbearbeiter.Text = IIf(sachbearbeiterAufRechnung = "Herr Ordu", "Verrechnung", sachbearbeiterAufRechnung) 'könnten ja mehrerer SB die Rg-Anlagen geschreiben haben - NEU
 
+        If sachbearbeiterAufRechnung = "" Then
+            rpt.lblSachbearbeiter.Text = getSBRgName(Row("Firma_ID"), Row("Sachbearbeiter").ToString.ToUpper)
+        Else
+            rpt.lblSachbearbeiter.Text = sachbearbeiterAufRechnung
+        End If
+        'könnten ja mehrerer SB die Rg-Anlagen geschreiben haben - NEU
 
-        rpt.lblSachbearbeiter.Text = getSBRgName(Firma.Firma_ID, VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME) 'könnten ja mehrerer SB die Rg-Anlagen geschreiben haben
+        'könnten ja mehrerer SB die Rg-Anlagen geschreiben haben
         rpt.lblFirmenbuch.Text = If(Firma.Firma_Firmenbuch, "").ToString.Replace("Firmenbuch: ", "").Trim
         rpt.lblUID.Text = If(Firma.Firma_UID, "").ToString.Replace("UID: ", "").Trim
         rpt.lblEORI.Text = If(Firma.Firma_EORI, "")

SDL/USTV/frmMDM_USTVAntrag.vb

@@ -2478,7 +2478,7 @@ Public Class frmMDM_USTVAntrag
         For Each dgvRow As DataGridViewRow In dgvUSTVPositionen.SelectedRows
             posId &= "'" & dgvRow.Cells("UStVPo_ID").Value & "'"
             counter = counter + 1
-            If (dgvUSTVPositionen.Rows.Count <> 0 And counter <> dgvUSTVPositionen.Rows.Count) Then posId &= ","
+            If (dgvUSTVPositionen.SelectedRows.Count <> 1 And counter <> dgvUSTVPositionen.SelectedRows.Count) Then posId &= ","
         Next
 
 

SDL/USTV/usrCntlUSTV.Designer.vb

@@ -28,6 +28,7 @@ Partial Class usrCntlUSTV
         Me.dgvUSTV = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.Label1 = New System.Windows.Forms.Label()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.btnWikiStatusmails = New System.Windows.Forms.Button()
         Me.lblVZhint = New System.Windows.Forms.Label()
         Me.lblVZKunde = New System.Windows.Forms.Label()
         Me.txtRisiko = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -71,7 +72,8 @@ Partial Class usrCntlUSTV
         Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.btnWikiStatusmails = New System.Windows.Forms.Button()
+        Me.lblFR = New System.Windows.Forms.Label()
+        Me.lblFRhint = New System.Windows.Forms.Label()
         CType(Me.dgvUSTV, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel1.SuspendLayout()
         Me.Panel2.SuspendLayout()
@@ -119,6 +121,8 @@ Partial Class usrCntlUSTV
         'Panel1
         '
         Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.Panel1.Controls.Add(Me.lblFRhint)
+        Me.Panel1.Controls.Add(Me.lblFR)
         Me.Panel1.Controls.Add(Me.btnWikiStatusmails)
         Me.Panel1.Controls.Add(Me.lblVZhint)
         Me.Panel1.Controls.Add(Me.lblVZKunde)
@@ -157,10 +161,22 @@ Partial Class usrCntlUSTV
         Me.Panel1.Size = New System.Drawing.Size(1627, 108)
         Me.Panel1.TabIndex = 0
         '
+        'btnWikiStatusmails
+        '
+        Me.btnWikiStatusmails.BackgroundImage = Global.SDL.My.Resources.Resources.fragezeichen
+        Me.btnWikiStatusmails.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.btnWikiStatusmails.FlatAppearance.BorderSize = 0
+        Me.btnWikiStatusmails.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnWikiStatusmails.Location = New System.Drawing.Point(65, 6)
+        Me.btnWikiStatusmails.Name = "btnWikiStatusmails"
+        Me.btnWikiStatusmails.Size = New System.Drawing.Size(25, 20)
+        Me.btnWikiStatusmails.TabIndex = 71
+        Me.btnWikiStatusmails.UseVisualStyleBackColor = True
+        '
         'lblVZhint
         '
         Me.lblVZhint.AutoSize = True
-        Me.lblVZhint.Location = New System.Drawing.Point(4, 60)
+        Me.lblVZhint.Location = New System.Drawing.Point(90, 44)
         Me.lblVZhint.Name = "lblVZhint"
         Me.lblVZhint.Size = New System.Drawing.Size(0, 13)
         Me.lblVZhint.TabIndex = 58
@@ -170,7 +186,7 @@ Partial Class usrCntlUSTV
         Me.lblVZKunde.AutoSize = True
         Me.lblVZKunde.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblVZKunde.ForeColor = System.Drawing.Color.Red
-        Me.lblVZKunde.Location = New System.Drawing.Point(4, 39)
+        Me.lblVZKunde.Location = New System.Drawing.Point(4, 40)
         Me.lblVZKunde.Name = "lblVZKunde"
         Me.lblVZKunde.Size = New System.Drawing.Size(83, 16)
         Me.lblVZKunde.TabIndex = 57
@@ -784,17 +800,25 @@ Partial Class usrCntlUSTV
         Me.ContextMenuStrip3.Name = "ContextMenuStrip1"
         Me.ContextMenuStrip3.Size = New System.Drawing.Size(61, 4)
         '
-        'btnWikiStatusmails
+        'lblFR
         '
-        Me.btnWikiStatusmails.BackgroundImage = Global.SDL.My.Resources.Resources.fragezeichen
+        Me.lblFR.AutoSize = True
-        Me.btnWikiStatusmails.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.lblFR.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnWikiStatusmails.FlatAppearance.BorderSize = 0
+        Me.lblFR.ForeColor = System.Drawing.Color.Red
-        Me.btnWikiStatusmails.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.lblFR.Location = New System.Drawing.Point(4, 60)
-        Me.btnWikiStatusmails.Location = New System.Drawing.Point(65, 6)
+        Me.lblFR.Name = "lblFR"
-        Me.btnWikiStatusmails.Name = "btnWikiStatusmails"
+        Me.lblFR.Size = New System.Drawing.Size(27, 16)
-        Me.btnWikiStatusmails.Size = New System.Drawing.Size(25, 20)
+        Me.lblFR.TabIndex = 72
-        Me.btnWikiStatusmails.TabIndex = 71
+        Me.lblFR.Text = "FR"
-        Me.btnWikiStatusmails.UseVisualStyleBackColor = True
+        Me.lblFR.Visible = False
+        '
+        'lblFRhint
+        '
+        Me.lblFRhint.AutoSize = True
+        Me.lblFRhint.Location = New System.Drawing.Point(31, 63)
+        Me.lblFRhint.Name = "lblFRhint"
+        Me.lblFRhint.Size = New System.Drawing.Size(0, 13)
+        Me.lblFRhint.TabIndex = 73
         '
         'usrCntlUSTV
         '
@@ -862,4 +886,6 @@ Partial Class usrCntlUSTV
     Friend WithEvents lblVZKunde As Label
     Friend WithEvents ContextMenuStrip3 As ContextMenuStrip
     Friend WithEvents btnWikiStatusmails As Button
+    Friend WithEvents lblFR As Label
+    Friend WithEvents lblFRhint As Label
 End Class

SDL/USTV/usrCntlUSTV.vb

@@ -1086,15 +1086,19 @@ Public Class usrCntlUSTV
             If KUNDE.Abfertigungsverbot Then Panel1.BackColor = Color.IndianRed
             If KUNDE_ERW.kde_AnmerkungVZ IsNot Nothing Then
                 lblVZhint.Text = KUNDE_ERW.kde_AnmerkungVZ
+                lblFRhint.Text = KUNDE_ERW.kde_AnmerkungFR
             Else
 
             End If
             lblVZKunde.Visible = KUNDE_ERW.kde_VZ
+            lblFR.Visible = KUNDE_ERW.kde_FR
 
         Else
 
             lblVZKunde.Visible = False
+            lblFR.Visible = False
             lblVZhint.Text = ""
+            lblFRhint.Text = ""
             Panel1.BackColor = Color.FromArgb(240, 245, 255)
         End If
 

SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb

@@ -24,12 +24,9 @@ Partial Class ustCntlUSTV_AntragPosition
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
         Me.tabDok = New System.Windows.Forms.TabPage()
-        Me.scanSonstiges = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
         Me.tbcntr = New System.Windows.Forms.TabControl()
         Me.tabVollmachten = New System.Windows.Forms.TabPage()
-        Me.scanUSTVVollmachten = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
         Me.tabFABest = New System.Windows.Forms.TabPage()
-        Me.scanUSTVFABest = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
         Me.Label8 = New System.Windows.Forms.Label()
         Me.Label7 = New System.Windows.Forms.Label()
         Me.Panel2 = New System.Windows.Forms.Panel()
@@ -49,20 +46,31 @@ Partial Class ustCntlUSTV_AntragPosition
         Me.lblAenderungsdatum = New System.Windows.Forms.Label()
         Me.lblSachbearbeiter = New System.Windows.Forms.Label()
         Me.pnl = New System.Windows.Forms.Panel()
-        Me.cbxAntragsfilter = New VERAG_PROG_ALLGEMEIN.MyCheckBoxValue(Me.components)
         Me.lblWarning = New System.Windows.Forms.Label()
         Me.btnLeistenderSave = New System.Windows.Forms.Button()
-        Me.sbLeistender = New VERAG_PROG_ALLGEMEIN.MySearchBox()
         Me.pnlAdresse = New System.Windows.Forms.Panel()
-        Me.txtStrasse = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.txtUIDNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.Label14 = New System.Windows.Forms.Label()
         Me.Label17 = New System.Windows.Forms.Label()
         Me.Label15 = New System.Windows.Forms.Label()
+        Me.Label16 = New System.Windows.Forms.Label()
+        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.btnAPIUbload = New System.Windows.Forms.Button()
+        Me.Panel3 = New System.Windows.Forms.Panel()
+        Me.Panel4 = New System.Windows.Forms.Panel()
+        Me.TabControl1 = New System.Windows.Forms.TabControl()
+        Me.TabPage1 = New System.Windows.Forms.TabPage()
+        Me.scanSonstiges = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
+        Me.scanUSTVVollmachten = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
+        Me.scanUSTVFABest = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
+        Me.UsrcntlPDFScanList1 = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
+        Me.scanLieferschein = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
+        Me.cbxAntragsfilter = New VERAG_PROG_ALLGEMEIN.MyCheckBoxValue(Me.components)
+        Me.sbLeistender = New VERAG_PROG_ALLGEMEIN.MySearchBox()
+        Me.txtStrasse = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txtUIDNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtLand = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtPLZ = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtStrassenNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.Label16 = New System.Windows.Forms.Label()
         Me.txtOrt = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.cboSchnittstellennr = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.txtRgNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -73,14 +81,6 @@ Partial Class ustCntlUSTV_AntragPosition
         Me.txtUSTBetragEUR = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtUmrechnungskurs = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtUSTBetrag = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.Panel1 = New System.Windows.Forms.Panel()
-        Me.btnAPIUbload = New System.Windows.Forms.Button()
-        Me.Panel3 = New System.Windows.Forms.Panel()
-        Me.Panel4 = New System.Windows.Forms.Panel()
-        Me.TabControl1 = New System.Windows.Forms.TabControl()
-        Me.TabPage1 = New System.Windows.Forms.TabPage()
-        Me.UsrcntlPDFScanList1 = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
-        Me.scanLieferschein = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
         Me.tabDok.SuspendLayout()
         Me.tbcntr.SuspendLayout()
         Me.tabVollmachten.SuspendLayout()
@@ -106,27 +106,6 @@ Partial Class ustCntlUSTV_AntragPosition
         Me.tabDok.Text = "Rechnungen"
         Me.tabDok.UseVisualStyleBackColor = True
         '
-        'scanSonstiges
-        '
-        Me.scanSonstiges._DATENSERVER_KATEGORIE = "DOKUMENTE"
-        Me.scanSonstiges._DATENSERVER_ORDNER = "MDM"
-        Me.scanSonstiges._DATENSERVER_UOrdner1 = ""
-        Me.scanSonstiges._DATENSERVER_UOrdner2 = ""
-        Me.scanSonstiges._DATENSERVER_UOrdner3 = ""
-        Me.scanSonstiges._OPEN_ORIGINAL = False
-        Me.scanSonstiges._TYPE = "PDF"
-        Me.scanSonstiges.AllowDrop = True
-        Me.scanSonstiges.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
-        Me.scanSonstiges.BackColor = System.Drawing.Color.White
-        Me.scanSonstiges.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.scanSonstiges.Cursor = System.Windows.Forms.Cursors.Hand
-        Me.scanSonstiges.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.scanSonstiges.Location = New System.Drawing.Point(3, 3)
-        Me.scanSonstiges.Margin = New System.Windows.Forms.Padding(0)
-        Me.scanSonstiges.Name = "scanSonstiges"
-        Me.scanSonstiges.Size = New System.Drawing.Size(250, 191)
-        Me.scanSonstiges.TabIndex = 0
-        '
         'tbcntr
         '
         Me.tbcntr.Controls.Add(Me.tabDok)
@@ -150,27 +129,6 @@ Partial Class ustCntlUSTV_AntragPosition
         Me.tabVollmachten.Text = "Vollmachten"
         Me.tabVollmachten.UseVisualStyleBackColor = True
         '
-        'scanUSTVVollmachten
-        '
-        Me.scanUSTVVollmachten._DATENSERVER_KATEGORIE = "DOKUMENTE"
-        Me.scanUSTVVollmachten._DATENSERVER_ORDNER = "MDM"
-        Me.scanUSTVVollmachten._DATENSERVER_UOrdner1 = ""
-        Me.scanUSTVVollmachten._DATENSERVER_UOrdner2 = ""
-        Me.scanUSTVVollmachten._DATENSERVER_UOrdner3 = ""
-        Me.scanUSTVVollmachten._OPEN_ORIGINAL = False
-        Me.scanUSTVVollmachten._TYPE = "PDF"
-        Me.scanUSTVVollmachten.AllowDrop = True
-        Me.scanUSTVVollmachten.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
-        Me.scanUSTVVollmachten.BackColor = System.Drawing.Color.White
-        Me.scanUSTVVollmachten.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.scanUSTVVollmachten.Cursor = System.Windows.Forms.Cursors.Hand
-        Me.scanUSTVVollmachten.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.scanUSTVVollmachten.Location = New System.Drawing.Point(3, 3)
-        Me.scanUSTVVollmachten.Margin = New System.Windows.Forms.Padding(0)
-        Me.scanUSTVVollmachten.Name = "scanUSTVVollmachten"
-        Me.scanUSTVVollmachten.Size = New System.Drawing.Size(250, 191)
-        Me.scanUSTVVollmachten.TabIndex = 1
-        '
         'tabFABest
         '
         Me.tabFABest.Controls.Add(Me.scanUSTVFABest)
@@ -181,27 +139,6 @@ Partial Class ustCntlUSTV_AntragPosition
         Me.tabFABest.Text = "FA_Bestätigung"
         Me.tabFABest.UseVisualStyleBackColor = True
         '
-        'scanUSTVFABest
-        '
-        Me.scanUSTVFABest._DATENSERVER_KATEGORIE = "DOKUMENTE"
-        Me.scanUSTVFABest._DATENSERVER_ORDNER = "MDM"
-        Me.scanUSTVFABest._DATENSERVER_UOrdner1 = ""
-        Me.scanUSTVFABest._DATENSERVER_UOrdner2 = ""
-        Me.scanUSTVFABest._DATENSERVER_UOrdner3 = ""
-        Me.scanUSTVFABest._OPEN_ORIGINAL = False
-        Me.scanUSTVFABest._TYPE = "PDF"
-        Me.scanUSTVFABest.AllowDrop = True
-        Me.scanUSTVFABest.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
-        Me.scanUSTVFABest.BackColor = System.Drawing.Color.White
-        Me.scanUSTVFABest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.scanUSTVFABest.Cursor = System.Windows.Forms.Cursors.Hand
-        Me.scanUSTVFABest.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.scanUSTVFABest.Location = New System.Drawing.Point(0, 0)
-        Me.scanUSTVFABest.Margin = New System.Windows.Forms.Padding(0)
-        Me.scanUSTVFABest.Name = "scanUSTVFABest"
-        Me.scanUSTVFABest.Size = New System.Drawing.Size(256, 197)
-        Me.scanUSTVFABest.TabIndex = 1
-        '
         'Label8
         '
         Me.Label8.AutoSize = True
@@ -426,20 +363,6 @@ Partial Class ustCntlUSTV_AntragPosition
         Me.pnl.Size = New System.Drawing.Size(1300, 239)
         Me.pnl.TabIndex = 1
         '
-        'cbxAntragsfilter
-        '
-        Me.cbxAntragsfilter._date = Nothing
-        Me.cbxAntragsfilter._showdate = False
-        Me.cbxAntragsfilter._value = ""
-        Me.cbxAntragsfilter.AutoSize = True
-        Me.cbxAntragsfilter.Location = New System.Drawing.Point(779, 29)
-        Me.cbxAntragsfilter.Name = "cbxAntragsfilter"
-        Me.cbxAntragsfilter.Size = New System.Drawing.Size(134, 17)
-        Me.cbxAntragsfilter.TabIndex = 24
-        Me.cbxAntragsfilter.Text = "*nach Antr.-Land filtern"
-        Me.cbxAntragsfilter.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
-        Me.cbxAntragsfilter.UseVisualStyleBackColor = True
-        '
         'lblWarning
         '
         Me.lblWarning.AutoSize = True
@@ -463,6 +386,245 @@ Partial Class ustCntlUSTV_AntragPosition
         Me.btnLeistenderSave.UseVisualStyleBackColor = True
         Me.btnLeistenderSave.Visible = False
         '
+        'pnlAdresse
+        '
+        Me.pnlAdresse.AccessibleRole = System.Windows.Forms.AccessibleRole.WhiteSpace
+        Me.pnlAdresse.Controls.Add(Me.txtStrasse)
+        Me.pnlAdresse.Controls.Add(Me.txtUIDNr)
+        Me.pnlAdresse.Controls.Add(Me.Label14)
+        Me.pnlAdresse.Controls.Add(Me.Label17)
+        Me.pnlAdresse.Controls.Add(Me.Label15)
+        Me.pnlAdresse.Controls.Add(Me.txtLand)
+        Me.pnlAdresse.Controls.Add(Me.txtPLZ)
+        Me.pnlAdresse.Controls.Add(Me.txtStrassenNr)
+        Me.pnlAdresse.Controls.Add(Me.Label16)
+        Me.pnlAdresse.Controls.Add(Me.txtOrt)
+        Me.pnlAdresse.Location = New System.Drawing.Point(626, 76)
+        Me.pnlAdresse.Name = "pnlAdresse"
+        Me.pnlAdresse.Size = New System.Drawing.Size(287, 82)
+        Me.pnlAdresse.TabIndex = 14
+        '
+        'Label14
+        '
+        Me.Label14.AutoSize = True
+        Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!)
+        Me.Label14.Location = New System.Drawing.Point(4, 5)
+        Me.Label14.Name = "Label14"
+        Me.Label14.Size = New System.Drawing.Size(64, 15)
+        Me.Label14.TabIndex = 23
+        Me.Label14.Text = "Strasse/Nr"
+        '
+        'Label17
+        '
+        Me.Label17.AutoSize = True
+        Me.Label17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!)
+        Me.Label17.Location = New System.Drawing.Point(129, 63)
+        Me.Label17.Name = "Label17"
+        Me.Label17.Size = New System.Drawing.Size(45, 15)
+        Me.Label17.TabIndex = 31
+        Me.Label17.Text = "UID-Nr"
+        '
+        'Label15
+        '
+        Me.Label15.AutoSize = True
+        Me.Label15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!)
+        Me.Label15.Location = New System.Drawing.Point(8, 32)
+        Me.Label15.Name = "Label15"
+        Me.Label15.Size = New System.Drawing.Size(48, 15)
+        Me.Label15.TabIndex = 25
+        Me.Label15.Text = "PLZ/Ort"
+        '
+        'Label16
+        '
+        Me.Label16.AutoSize = True
+        Me.Label16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!)
+        Me.Label16.Location = New System.Drawing.Point(8, 58)
+        Me.Label16.Name = "Label16"
+        Me.Label16.Size = New System.Drawing.Size(35, 15)
+        Me.Label16.TabIndex = 27
+        Me.Label16.Text = "Land"
+        '
+        'Panel1
+        '
+        Me.Panel1.Controls.Add(Me.btnAPIUbload)
+        Me.Panel1.Controls.Add(Me.btnBildAuf)
+        Me.Panel1.Controls.Add(Me.Button1)
+        Me.Panel1.Dock = System.Windows.Forms.DockStyle.Right
+        Me.Panel1.Location = New System.Drawing.Point(937, 30)
+        Me.Panel1.Name = "Panel1"
+        Me.Panel1.Size = New System.Drawing.Size(99, 239)
+        Me.Panel1.TabIndex = 2
+        '
+        'btnAPIUbload
+        '
+        Me.btnAPIUbload.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.btnAPIUbload.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnAPIUbload.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnAPIUbload.Location = New System.Drawing.Point(16, 186)
+        Me.btnAPIUbload.Name = "btnAPIUbload"
+        Me.btnAPIUbload.Size = New System.Drawing.Size(71, 24)
+        Me.btnAPIUbload.TabIndex = 25
+        Me.btnAPIUbload.Text = "API-Upload"
+        Me.btnAPIUbload.UseVisualStyleBackColor = True
+        '
+        'Panel3
+        '
+        Me.Panel3.Controls.Add(Me.tbcntr)
+        Me.Panel3.Controls.Add(Me.Panel4)
+        Me.Panel3.Dock = System.Windows.Forms.DockStyle.Right
+        Me.Panel3.Location = New System.Drawing.Point(1036, 30)
+        Me.Panel3.Name = "Panel3"
+        Me.Panel3.Size = New System.Drawing.Size(264, 239)
+        Me.Panel3.TabIndex = 25
+        '
+        'Panel4
+        '
+        Me.Panel4.Controls.Add(Me.TabControl1)
+        Me.Panel4.Controls.Add(Me.scanLieferschein)
+        Me.Panel4.Dock = System.Windows.Forms.DockStyle.Top
+        Me.Panel4.Location = New System.Drawing.Point(0, 0)
+        Me.Panel4.Name = "Panel4"
+        Me.Panel4.Size = New System.Drawing.Size(264, 16)
+        Me.Panel4.TabIndex = 26
+        '
+        'TabControl1
+        '
+        Me.TabControl1.Controls.Add(Me.TabPage1)
+        Me.TabControl1.Location = New System.Drawing.Point(39, 49)
+        Me.TabControl1.Name = "TabControl1"
+        Me.TabControl1.SelectedIndex = 0
+        Me.TabControl1.Size = New System.Drawing.Size(278, 239)
+        Me.TabControl1.TabIndex = 3
+        '
+        'TabPage1
+        '
+        Me.TabPage1.Controls.Add(Me.UsrcntlPDFScanList1)
+        Me.TabPage1.Location = New System.Drawing.Point(4, 22)
+        Me.TabPage1.Name = "TabPage1"
+        Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
+        Me.TabPage1.Size = New System.Drawing.Size(270, 213)
+        Me.TabPage1.TabIndex = 1
+        Me.TabPage1.Text = "Dokumente"
+        Me.TabPage1.UseVisualStyleBackColor = True
+        '
+        'scanSonstiges
+        '
+        Me.scanSonstiges._DATENSERVER_KATEGORIE = "DOKUMENTE"
+        Me.scanSonstiges._DATENSERVER_ORDNER = "MDM"
+        Me.scanSonstiges._DATENSERVER_UOrdner1 = ""
+        Me.scanSonstiges._DATENSERVER_UOrdner2 = ""
+        Me.scanSonstiges._DATENSERVER_UOrdner3 = ""
+        Me.scanSonstiges._OPEN_ORIGINAL = False
+        Me.scanSonstiges._TYPE = "PDF"
+        Me.scanSonstiges.AllowDrop = True
+        Me.scanSonstiges.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+        Me.scanSonstiges.BackColor = System.Drawing.Color.White
+        Me.scanSonstiges.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.scanSonstiges.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.scanSonstiges.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.scanSonstiges.Location = New System.Drawing.Point(3, 3)
+        Me.scanSonstiges.Margin = New System.Windows.Forms.Padding(0)
+        Me.scanSonstiges.Name = "scanSonstiges"
+        Me.scanSonstiges.Size = New System.Drawing.Size(250, 191)
+        Me.scanSonstiges.TabIndex = 0
+        '
+        'scanUSTVVollmachten
+        '
+        Me.scanUSTVVollmachten._DATENSERVER_KATEGORIE = "DOKUMENTE"
+        Me.scanUSTVVollmachten._DATENSERVER_ORDNER = "MDM"
+        Me.scanUSTVVollmachten._DATENSERVER_UOrdner1 = ""
+        Me.scanUSTVVollmachten._DATENSERVER_UOrdner2 = ""
+        Me.scanUSTVVollmachten._DATENSERVER_UOrdner3 = ""
+        Me.scanUSTVVollmachten._OPEN_ORIGINAL = False
+        Me.scanUSTVVollmachten._TYPE = "PDF"
+        Me.scanUSTVVollmachten.AllowDrop = True
+        Me.scanUSTVVollmachten.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+        Me.scanUSTVVollmachten.BackColor = System.Drawing.Color.White
+        Me.scanUSTVVollmachten.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.scanUSTVVollmachten.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.scanUSTVVollmachten.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.scanUSTVVollmachten.Location = New System.Drawing.Point(3, 3)
+        Me.scanUSTVVollmachten.Margin = New System.Windows.Forms.Padding(0)
+        Me.scanUSTVVollmachten.Name = "scanUSTVVollmachten"
+        Me.scanUSTVVollmachten.Size = New System.Drawing.Size(250, 191)
+        Me.scanUSTVVollmachten.TabIndex = 1
+        '
+        'scanUSTVFABest
+        '
+        Me.scanUSTVFABest._DATENSERVER_KATEGORIE = "DOKUMENTE"
+        Me.scanUSTVFABest._DATENSERVER_ORDNER = "MDM"
+        Me.scanUSTVFABest._DATENSERVER_UOrdner1 = ""
+        Me.scanUSTVFABest._DATENSERVER_UOrdner2 = ""
+        Me.scanUSTVFABest._DATENSERVER_UOrdner3 = ""
+        Me.scanUSTVFABest._OPEN_ORIGINAL = False
+        Me.scanUSTVFABest._TYPE = "PDF"
+        Me.scanUSTVFABest.AllowDrop = True
+        Me.scanUSTVFABest.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+        Me.scanUSTVFABest.BackColor = System.Drawing.Color.White
+        Me.scanUSTVFABest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.scanUSTVFABest.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.scanUSTVFABest.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.scanUSTVFABest.Location = New System.Drawing.Point(0, 0)
+        Me.scanUSTVFABest.Margin = New System.Windows.Forms.Padding(0)
+        Me.scanUSTVFABest.Name = "scanUSTVFABest"
+        Me.scanUSTVFABest.Size = New System.Drawing.Size(256, 197)
+        Me.scanUSTVFABest.TabIndex = 1
+        '
+        'UsrcntlPDFScanList1
+        '
+        Me.UsrcntlPDFScanList1._DATENSERVER_KATEGORIE = "DOKUMENTE"
+        Me.UsrcntlPDFScanList1._DATENSERVER_ORDNER = "MDM"
+        Me.UsrcntlPDFScanList1._DATENSERVER_UOrdner1 = ""
+        Me.UsrcntlPDFScanList1._DATENSERVER_UOrdner2 = ""
+        Me.UsrcntlPDFScanList1._DATENSERVER_UOrdner3 = ""
+        Me.UsrcntlPDFScanList1._OPEN_ORIGINAL = False
+        Me.UsrcntlPDFScanList1._TYPE = "PDF"
+        Me.UsrcntlPDFScanList1.AllowDrop = True
+        Me.UsrcntlPDFScanList1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+        Me.UsrcntlPDFScanList1.BackColor = System.Drawing.Color.White
+        Me.UsrcntlPDFScanList1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.UsrcntlPDFScanList1.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.UsrcntlPDFScanList1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrcntlPDFScanList1.Location = New System.Drawing.Point(3, 3)
+        Me.UsrcntlPDFScanList1.Margin = New System.Windows.Forms.Padding(0)
+        Me.UsrcntlPDFScanList1.Name = "UsrcntlPDFScanList1"
+        Me.UsrcntlPDFScanList1.Size = New System.Drawing.Size(264, 207)
+        Me.UsrcntlPDFScanList1.TabIndex = 0
+        '
+        'scanLieferschein
+        '
+        Me.scanLieferschein._ARCHIV = True
+        Me.scanLieferschein._DATENSERVER_KATEGORIE = "DOKUMENTE"
+        Me.scanLieferschein._DATENSERVER_ORDNER = "MDM"
+        Me.scanLieferschein._DATENSERVER_UOrdner1 = Nothing
+        Me.scanLieferschein._DATENSERVER_UOrdner2 = Nothing
+        Me.scanLieferschein._DATENSERVER_UOrdner3 = Nothing
+        Me.scanLieferschein._MULTI_FILES = True
+        Me.scanLieferschein._TEXT_PDF = "XX Vollmacht"
+        Me.scanLieferschein.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+        Me.scanLieferschein.BackColor = System.Drawing.Color.White
+        Me.scanLieferschein.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.scanLieferschein.Cursor = System.Windows.Forms.Cursors.Default
+        Me.scanLieferschein.Location = New System.Drawing.Point(146, 3)
+        Me.scanLieferschein.Name = "scanLieferschein"
+        Me.scanLieferschein.Size = New System.Drawing.Size(111, 34)
+        Me.scanLieferschein.TabIndex = 2
+        Me.scanLieferschein.Visible = False
+        '
+        'cbxAntragsfilter
+        '
+        Me.cbxAntragsfilter._date = Nothing
+        Me.cbxAntragsfilter._showdate = False
+        Me.cbxAntragsfilter._value = ""
+        Me.cbxAntragsfilter.AutoSize = True
+        Me.cbxAntragsfilter.Location = New System.Drawing.Point(779, 29)
+        Me.cbxAntragsfilter.Name = "cbxAntragsfilter"
+        Me.cbxAntragsfilter.Size = New System.Drawing.Size(134, 17)
+        Me.cbxAntragsfilter.TabIndex = 24
+        Me.cbxAntragsfilter.Text = "*nach Antr.-Land filtern"
+        Me.cbxAntragsfilter.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
+        Me.cbxAntragsfilter.UseVisualStyleBackColor = True
+        '
         'sbLeistender
         '
         Me.sbLeistender._allowFreitext = True
@@ -488,24 +650,6 @@ Partial Class ustCntlUSTV_AntragPosition
         Me.sbLeistender.TabIndex = 9
         Me.sbLeistender.usrcntl = Nothing
         '
-        'pnlAdresse
-        '
-        Me.pnlAdresse.AccessibleRole = System.Windows.Forms.AccessibleRole.WhiteSpace
-        Me.pnlAdresse.Controls.Add(Me.txtStrasse)
-        Me.pnlAdresse.Controls.Add(Me.txtUIDNr)
-        Me.pnlAdresse.Controls.Add(Me.Label14)
-        Me.pnlAdresse.Controls.Add(Me.Label17)
-        Me.pnlAdresse.Controls.Add(Me.Label15)
-        Me.pnlAdresse.Controls.Add(Me.txtLand)
-        Me.pnlAdresse.Controls.Add(Me.txtPLZ)
-        Me.pnlAdresse.Controls.Add(Me.txtStrassenNr)
-        Me.pnlAdresse.Controls.Add(Me.Label16)
-        Me.pnlAdresse.Controls.Add(Me.txtOrt)
-        Me.pnlAdresse.Location = New System.Drawing.Point(626, 76)
-        Me.pnlAdresse.Name = "pnlAdresse"
-        Me.pnlAdresse.Size = New System.Drawing.Size(287, 82)
-        Me.pnlAdresse.TabIndex = 14
-        '
         'txtStrasse
         '
         Me.txtStrasse._DateTimeOnly = False
@@ -554,36 +698,6 @@ Partial Class ustCntlUSTV_AntragPosition
         Me.txtUIDNr.Size = New System.Drawing.Size(106, 20)
         Me.txtUIDNr.TabIndex = 15
         '
-        'Label14
-        '
-        Me.Label14.AutoSize = True
-        Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!)
-        Me.Label14.Location = New System.Drawing.Point(4, 5)
-        Me.Label14.Name = "Label14"
-        Me.Label14.Size = New System.Drawing.Size(64, 15)
-        Me.Label14.TabIndex = 23
-        Me.Label14.Text = "Strasse/Nr"
-        '
-        'Label17
-        '
-        Me.Label17.AutoSize = True
-        Me.Label17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!)
-        Me.Label17.Location = New System.Drawing.Point(129, 63)
-        Me.Label17.Name = "Label17"
-        Me.Label17.Size = New System.Drawing.Size(45, 15)
-        Me.Label17.TabIndex = 31
-        Me.Label17.Text = "UID-Nr"
-        '
-        'Label15
-        '
-        Me.Label15.AutoSize = True
-        Me.Label15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!)
-        Me.Label15.Location = New System.Drawing.Point(8, 32)
-        Me.Label15.Name = "Label15"
-        Me.Label15.Size = New System.Drawing.Size(48, 15)
-        Me.Label15.TabIndex = 25
-        Me.Label15.Text = "PLZ/Ort"
-        '
         'txtLand
         '
         Me.txtLand._DateTimeOnly = False
@@ -656,16 +770,6 @@ Partial Class ustCntlUSTV_AntragPosition
         Me.txtStrassenNr.Size = New System.Drawing.Size(45, 20)
         Me.txtStrassenNr.TabIndex = 11
         '
-        'Label16
-        '
-        Me.Label16.AutoSize = True
-        Me.Label16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!)
-        Me.Label16.Location = New System.Drawing.Point(8, 58)
-        Me.Label16.Name = "Label16"
-        Me.Label16.Size = New System.Drawing.Size(35, 15)
-        Me.Label16.TabIndex = 27
-        Me.Label16.Text = "Land"
-        '
         'txtOrt
         '
         Me.txtOrt._DateTimeOnly = False
@@ -875,110 +979,6 @@ Partial Class ustCntlUSTV_AntragPosition
         Me.txtUSTBetrag.Size = New System.Drawing.Size(154, 20)
         Me.txtUSTBetrag.TabIndex = 17
         '
-        'Panel1
-        '
-        Me.Panel1.Controls.Add(Me.btnAPIUbload)
-        Me.Panel1.Controls.Add(Me.btnBildAuf)
-        Me.Panel1.Controls.Add(Me.Button1)
-        Me.Panel1.Dock = System.Windows.Forms.DockStyle.Right
-        Me.Panel1.Location = New System.Drawing.Point(937, 30)
-        Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(99, 239)
-        Me.Panel1.TabIndex = 2
-        '
-        'btnAPIUbload
-        '
-        Me.btnAPIUbload.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.btnAPIUbload.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnAPIUbload.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnAPIUbload.Location = New System.Drawing.Point(16, 186)
-        Me.btnAPIUbload.Name = "btnAPIUbload"
-        Me.btnAPIUbload.Size = New System.Drawing.Size(71, 24)
-        Me.btnAPIUbload.TabIndex = 25
-        Me.btnAPIUbload.Text = "API-Upload"
-        Me.btnAPIUbload.UseVisualStyleBackColor = True
-        '
-        'Panel3
-        '
-        Me.Panel3.Controls.Add(Me.tbcntr)
-        Me.Panel3.Controls.Add(Me.Panel4)
-        Me.Panel3.Dock = System.Windows.Forms.DockStyle.Right
-        Me.Panel3.Location = New System.Drawing.Point(1036, 30)
-        Me.Panel3.Name = "Panel3"
-        Me.Panel3.Size = New System.Drawing.Size(264, 239)
-        Me.Panel3.TabIndex = 25
-        '
-        'Panel4
-        '
-        Me.Panel4.Controls.Add(Me.TabControl1)
-        Me.Panel4.Controls.Add(Me.scanLieferschein)
-        Me.Panel4.Dock = System.Windows.Forms.DockStyle.Top
-        Me.Panel4.Location = New System.Drawing.Point(0, 0)
-        Me.Panel4.Name = "Panel4"
-        Me.Panel4.Size = New System.Drawing.Size(264, 16)
-        Me.Panel4.TabIndex = 26
-        '
-        'TabControl1
-        '
-        Me.TabControl1.Controls.Add(Me.TabPage1)
-        Me.TabControl1.Location = New System.Drawing.Point(39, 49)
-        Me.TabControl1.Name = "TabControl1"
-        Me.TabControl1.SelectedIndex = 0
-        Me.TabControl1.Size = New System.Drawing.Size(278, 239)
-        Me.TabControl1.TabIndex = 3
-        '
-        'TabPage1
-        '
-        Me.TabPage1.Controls.Add(Me.UsrcntlPDFScanList1)
-        Me.TabPage1.Location = New System.Drawing.Point(4, 22)
-        Me.TabPage1.Name = "TabPage1"
-        Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage1.Size = New System.Drawing.Size(270, 213)
-        Me.TabPage1.TabIndex = 1
-        Me.TabPage1.Text = "Dokumente"
-        Me.TabPage1.UseVisualStyleBackColor = True
-        '
-        'UsrcntlPDFScanList1
-        '
-        Me.UsrcntlPDFScanList1._DATENSERVER_KATEGORIE = "DOKUMENTE"
-        Me.UsrcntlPDFScanList1._DATENSERVER_ORDNER = "MDM"
-        Me.UsrcntlPDFScanList1._DATENSERVER_UOrdner1 = ""
-        Me.UsrcntlPDFScanList1._DATENSERVER_UOrdner2 = ""
-        Me.UsrcntlPDFScanList1._DATENSERVER_UOrdner3 = ""
-        Me.UsrcntlPDFScanList1._OPEN_ORIGINAL = False
-        Me.UsrcntlPDFScanList1._TYPE = "PDF"
-        Me.UsrcntlPDFScanList1.AllowDrop = True
-        Me.UsrcntlPDFScanList1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
-        Me.UsrcntlPDFScanList1.BackColor = System.Drawing.Color.White
-        Me.UsrcntlPDFScanList1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.UsrcntlPDFScanList1.Cursor = System.Windows.Forms.Cursors.Hand
-        Me.UsrcntlPDFScanList1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrcntlPDFScanList1.Location = New System.Drawing.Point(3, 3)
-        Me.UsrcntlPDFScanList1.Margin = New System.Windows.Forms.Padding(0)
-        Me.UsrcntlPDFScanList1.Name = "UsrcntlPDFScanList1"
-        Me.UsrcntlPDFScanList1.Size = New System.Drawing.Size(264, 207)
-        Me.UsrcntlPDFScanList1.TabIndex = 0
-        '
-        'scanLieferschein
-        '
-        Me.scanLieferschein._ARCHIV = True
-        Me.scanLieferschein._DATENSERVER_KATEGORIE = "DOKUMENTE"
-        Me.scanLieferschein._DATENSERVER_ORDNER = "MDM"
-        Me.scanLieferschein._DATENSERVER_UOrdner1 = Nothing
-        Me.scanLieferschein._DATENSERVER_UOrdner2 = Nothing
-        Me.scanLieferschein._DATENSERVER_UOrdner3 = Nothing
-        Me.scanLieferschein._MULTI_FILES = True
-        Me.scanLieferschein._TEXT_PDF = "XX Vollmacht"
-        Me.scanLieferschein.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
-        Me.scanLieferschein.BackColor = System.Drawing.Color.White
-        Me.scanLieferschein.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.scanLieferschein.Cursor = System.Windows.Forms.Cursors.Default
-        Me.scanLieferschein.Location = New System.Drawing.Point(146, 3)
-        Me.scanLieferschein.Name = "scanLieferschein"
-        Me.scanLieferschein.Size = New System.Drawing.Size(111, 34)
-        Me.scanLieferschein.TabIndex = 2
-        Me.scanLieferschein.Visible = False
-        '
         'ustCntlUSTV_AntragPosition
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

SDL/USTV/ustCntlUSTV_AntragPosition.vb

@@ -51,9 +51,9 @@ Public Class ustCntlUSTV_AntragPosition
         Dim filter As String = "UstV_aktiv = 1"
         If Antrag_LandKz <> "" AndAlso cbxAntragsfilter.Checked Then
             filter &= " and left(UstV_Leistender_UstNr,2)='" & Antrag_LandKz & "'"
-            sbLeistender.initSearchBox(Me.FindForm, "[UStV_LeistenderId],[UStV_Leistender], ([UStV_Leistender] + ' ' + isnull([UstV_Leistender_UstNr],'')) as Leistender,[UstV_Leistender_PLZ] as PLZ, ([UstV_Leistender_Strasse] + ' ' +[UstV_Leistender_StrasseNr]) as Strasse, [UstV_Leistender_Stadt] as Stadt  FROM [tblUStVLeistender]", {"UStV_Leistender", "UstV_Leistender_UstNr"}, filter, "UStV_Leistender", "UStV_LeistenderId", "Leistender", "FMZOLL",, 400, 200, {"UStV_Leistender", "UStV_LeistenderId"})
+            sbLeistender.initSearchBox(Me.FindForm, "[UStV_LeistenderId],[UStV_Leistender], ([UStV_Leistender]) as Leistender,[UstV_Leistender_PLZ] as PLZ, ([UstV_Leistender_Strasse] + ' ' +[UstV_Leistender_StrasseNr]) as Strasse, [UstV_Leistender_Stadt] as Stadt  FROM [tblUStVLeistender]", {"UStV_Leistender", "UstV_Leistender_UstNr"}, filter, "UStV_Leistender", "UStV_LeistenderId", "Leistender", "FMZOLL",, 400, 200, {"UStV_Leistender", "UStV_LeistenderId"})
         Else
-            sbLeistender.initSearchBox(Me.FindForm, "[UStV_LeistenderId],[UStV_Leistender], ([UStV_Leistender] + ' ' + isnull([UstV_Leistender_UstNr],'')) as Leistender,[UstV_Leistender_PLZ] as PLZ, ([UstV_Leistender_Strasse] + ' ' +[UstV_Leistender_StrasseNr]) as Strasse, [UstV_Leistender_Stadt] as Stadt  FROM [tblUStVLeistender]", {"UStV_Leistender", "UstV_Leistender_UstNr"}, filter, "UStV_Leistender", "UStV_LeistenderId", "Leistender", "FMZOLL",, 400, 200, {"UStV_Leistender", "UStV_LeistenderId"})
+            sbLeistender.initSearchBox(Me.FindForm, "[UStV_LeistenderId],[UStV_Leistender], ([UStV_Leistender]) as Leistender,[UstV_Leistender_PLZ] as PLZ, ([UstV_Leistender_Strasse] + ' ' +[UstV_Leistender_StrasseNr]) as Strasse, [UstV_Leistender_Stadt] as Stadt  FROM [tblUStVLeistender]", {"UStV_Leistender", "UstV_Leistender_UstNr"}, filter, "UStV_Leistender", "UStV_LeistenderId", "Leistender", "FMZOLL",, 400, 200, {"UStV_Leistender", "UStV_LeistenderId"})
         End If
 
     End Sub
@@ -122,9 +122,9 @@ Public Class ustCntlUSTV_AntragPosition
         Dim filter As String = "UstV_aktiv = 1"
         If Antrag_LandKz <> "" AndAlso cbxAntragsfilter.Checked Then
             filter &= " and left(UstV_Leistender_UstNr,2)='" & Antrag_LandKz & "'"
-            sbLeistender.initSearchBox(Me.FindForm, "[UStV_LeistenderId],[UStV_Leistender], ([UStV_Leistender] + ' ' + isnull([UstV_Leistender_UstNr],'')) as Leistender,[UstV_Leistender_PLZ] as PLZ, ([UstV_Leistender_Strasse] + ' ' +[UstV_Leistender_StrasseNr]) as Strasse, [UstV_Leistender_Stadt] as Stadt  FROM [tblUStVLeistender]", {"UStV_Leistender", "UstV_Leistender_UstNr"}, filter, "UStV_Leistender", "UStV_LeistenderId", "Leistender", "FMZOLL",, 400, 200, {"UStV_Leistender", "UStV_LeistenderId"})
+            sbLeistender.initSearchBox(Me.FindForm, "[UStV_LeistenderId],[UStV_Leistender], ([UStV_Leistender] ) as Leistender,[UstV_Leistender_PLZ] as PLZ, ([UstV_Leistender_Strasse] + ' ' +[UstV_Leistender_StrasseNr]) as Strasse, [UstV_Leistender_Stadt] as Stadt  FROM [tblUStVLeistender]", {"UStV_Leistender", "UstV_Leistender_UstNr"}, filter, "UStV_Leistender", "UStV_LeistenderId", "Leistender", "FMZOLL",, 400, 200, {"UStV_Leistender", "UStV_LeistenderId"})
         Else
-            sbLeistender.initSearchBox(Me.FindForm, "[UStV_LeistenderId],[UStV_Leistender], ([UStV_Leistender] + ' ' + isnull([UstV_Leistender_UstNr],'')) as Leistender,[UstV_Leistender_PLZ] as PLZ, ([UstV_Leistender_Strasse] + ' ' +[UstV_Leistender_StrasseNr]) as Strasse, [UstV_Leistender_Stadt] as Stadt  FROM [tblUStVLeistender]", {"UStV_Leistender", "UstV_Leistender_UstNr"}, filter, "UStV_Leistender", "UStV_LeistenderId", "Leistender", "FMZOLL",, 400, 200, {"UStV_Leistender", "UStV_LeistenderId"})
+            sbLeistender.initSearchBox(Me.FindForm, "[UStV_LeistenderId],[UStV_Leistender], ([UStV_Leistender]) as Leistender,[UstV_Leistender_PLZ] as PLZ, ([UstV_Leistender_Strasse] + ' ' +[UstV_Leistender_StrasseNr]) as Strasse, [UstV_Leistender_Stadt] as Stadt  FROM [tblUStVLeistender]", {"UStV_Leistender", "UstV_Leistender_UstNr"}, filter, "UStV_Leistender", "UStV_LeistenderId", "Leistender", "FMZOLL",, 400, 200, {"UStV_Leistender", "UStV_LeistenderId"})
         End If
 
         'sbLeistender.initSearchBox(Me.FindForm, "[UStV_LeistenderId],[UStV_Leistender], ([UStV_Leistender] + ' ' + isnull([UstV_Leistender_UstNr],'')) as Leistender,[UstV_Leistender_PLZ] as PLZ, ([UstV_Leistender_Strasse] + ' ' +[UstV_Leistender_StrasseNr]) as Strasse, [UstV_Leistender_Stadt] as Stadt  FROM [tblUStVLeistender]", {"UStV_Leistender", "UstV_Leistender_UstNr"}, "UstV_aktiv = 1", "UStV_Leistender", "UStV_LeistenderId", "Leistender", "FMZOLL",, 400, 200, {"UStV_Leistender", "UStV_LeistenderId"})
@@ -723,5 +723,31 @@ Public Class ustCntlUSTV_AntragPosition
 
 
 
+    End Sub
+
+    Private Sub txtStrasse_PreviewKeyDown(sender As Object, e As PreviewKeyDownEventArgs) Handles txtStrasse.PreviewKeyDown, txtPLZ.PreviewKeyDown, txtOrt.PreviewKeyDown, txtLand.PreviewKeyDown, txtStrassenNr.PreviewKeyDown
+
+        If gridAktiv And Me.FindForm IsNot Nothing Then
+
+            ' Eingabeprüfung
+            If e.KeyValue = 9 Then
+
+                Dim leistNew = sbLeistender.Text
+                UStV_Leist = New VERAG_PROG_ALLGEMEIN.cUStVLeistender(leistNew)
+
+                If UStV_Leist.UstV_Leistender_Strasse <> If(txtStrasse.Text, "") Then SomethingChanged(sender, e)
+                If UStV_Leist.UstV_Leistender_StrasseNr <> If(txtStrassenNr.Text, "") Then SomethingChanged(sender, e)
+                If UStV_Leist.UstV_Leistender_PLZ <> If(txtPLZ.Text, "") Then SomethingChanged(sender, e)
+                If UStV_Leist.UstV_Leistender_Stadt <> If(txtOrt.Text, "") Then SomethingChanged(sender, e)
+                If UStV_Leist.UstV_Leistender_Land <> If(txtLand.Text, "") Then SomethingChanged(sender, e)
+                If UStV_Leist.UstV_Leistender_UstNr <> If(txtUIDNr.Text, "") Then SomethingChanged(sender, e)
+
+            End If
+
+        End If
+
+
+
+
     End Sub
 End Class

SDL/frmLogin.vb

@@ -60,6 +60,10 @@ Public Class frmLogin
         'Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0F, 13.0F)
         'Me.TextOptions.TextFormattingMode = "Display"
         Dim PARAM = ""
+
+        'PARAM = "SAMMELRECHNUNG_AUTOSENT"
+        'VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
+
         Dim parameter() As String = Environment.GetCommandLineArgs().ToArray
         If (parameter.Count - 1) >= 1 Then 'Höher als 1 weil der index 0 der Pfad zum programm ist
             PARAM = parameter(1)
@@ -73,7 +77,7 @@ Public Class frmLogin
                 cRKSV.printNULLBeleg(KASSE, Nothing, True, KASSE.rksv_firma) 'Beleg drucken
             Next
             Application.Exit()
-            Exit Sub
+            End 'immediately terminates further execution
 
         ElseIf PARAM = "SAMMELRECHNUNG_AUTOSENT" Then
 
@@ -105,10 +109,11 @@ Public Class frmLogin
             End If
 
 
-
+            Dim func As New cAutomailversand
-                Dim func As New cAutomailversand
             func.sendMailSammelrechnung(REDat, SRT_ART, FirmaID)
 
+            Application.Exit()
+            End 'immediately terminates further execution
 
         End If
 

SDL/kunden/usrcntlFiskaluebersicht.vb

@@ -1,10 +1,5 @@
-
+Imports System.Net
-Imports System.Globalization
-Imports System.Linq.Expressions
-Imports System.Net
 Imports System.Text.RegularExpressions
-Imports com.sun.tools.doclets.internal.toolkit.util
-Imports Spire.Pdf.Graphics
 Imports VERAG_PROG_ALLGEMEIN
 
 Public Class usrcntlFiskaluebersicht
@@ -420,6 +415,17 @@ Public Class usrcntlFiskaluebersicht
             BA = VERAG_PROG_ALLGEMEIN.cBonitaetsauskunft.LOADByKdNrWithingDate(kdNr)
             setControlButtons()
 
+            If locked Then
+                BA = New VERAG_PROG_ALLGEMEIN.cBonitaetsauskunft(fk.FK_Bonitaet)
+
+                If BA.ba_CreditSaveBonitaetsIndex = 0 Then
+                    lblBon.Text = BA.ba_CreditSaveBonitaetsScore
+                Else
+                    lblBon.Text = BA.ba_CreditSaveBonitaetsIndex
+                End If
+
+            End If
+
         Else
 
             Button4.Enabled = False
@@ -502,7 +508,12 @@ Public Class usrcntlFiskaluebersicht
                 If ADRESSE.LandKz = "AT" Or ADRESSE.LandKz = "A" Then
                     lblBon.Text = If(BA.ba_CreditSaveBonitaetsScore, "")
                 Else
-                    lblBon.Text = If(BA.ba_CreditSaveBonitaetsIndex, "")
+                    If BA.ba_CreditSaveBonitaetsIndex = 0 Then
+                        lblBon.Text = If(BA.ba_CreditSaveBonitaetsScore, "")
+                    Else
+                        lblBon.Text = If(BA.ba_CreditSaveBonitaetsIndex, "")
+                    End If
+
                 End If
             End If
         End If

SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb

@@ -55,9 +55,11 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.cboFremdspedition = New System.Windows.Forms.ComboBox()
         Me.cbxVerzolltBei = New System.Windows.Forms.CheckBox()
         Me.cbxBesonderheitenNEU = New System.Windows.Forms.CheckBox()
+        Me.UsrCntlKundenBesonderheiten1 = New SDL.usrCntlKundenBesonderheiten()
         Me.tbcntrAbf = New System.Windows.Forms.TabControl()
         Me.TabPage4 = New System.Windows.Forms.TabPage()
         Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel()
+        Me.UsrCntlKundenAvisoMailBenachrichtigung1 = New SDL.usrCntlKundenAvisoMailBenachrichtigung()
         Me.rtbLKWFreigabeSenden = New System.Windows.Forms.RichTextBox()
         Me.Label18 = New System.Windows.Forms.Label()
         Me.TabPage3 = New System.Windows.Forms.TabPage()
@@ -71,6 +73,7 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.cboAbfVerb_Abfertigungsverbot = New System.Windows.Forms.CheckBox()
         Me.txtAbfVerb_AbfertigungsverbotSeit = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.tbAufschub = New System.Windows.Forms.TabPage()
+        Me.usrCntlAufschubkonten = New SDL.usrCntlAufschubkonten()
         Me.TabPage1 = New System.Windows.Forms.TabPage()
         Me.Label78 = New System.Windows.Forms.Label()
         Me.cbxAbf_ZollVM = New System.Windows.Forms.CheckBox()
@@ -95,6 +98,7 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.rtbAbf_Besonderheiten = New System.Windows.Forms.RichTextBox()
         Me.Panel1 = New System.Windows.Forms.Panel()
         Me.tbFiskal = New System.Windows.Forms.TabPage()
+        Me.UsrCntlKundeFiskaldaten1 = New SDL.usrCntlKundeFiskaldaten()
         Me.tbVerrechnung = New System.Windows.Forms.TabPage()
         Me.pnlverag360 = New System.Windows.Forms.Panel()
         Me.txtAnmerkungAntraege = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -363,6 +367,7 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.tbKontakt = New System.Windows.Forms.TabControl()
         Me.TabPage10 = New System.Windows.Forms.TabPage()
         Me.TabPage11 = New System.Windows.Forms.TabPage()
+        Me.ucKundenKontakte = New SDL.usrCntlKundenKontakte()
         Me.Label50 = New System.Windows.Forms.Label()
         Me.Label68 = New System.Windows.Forms.Label()
         Me.pnlNeukunde = New System.Windows.Forms.Panel()
@@ -388,11 +393,8 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.cboAuswahl = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.ucKundenKontakte = New SDL.usrCntlKundenKontakte()
+        Me.txtFR = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.UsrCntlKundenBesonderheiten1 = New SDL.usrCntlKundenBesonderheiten()
+        Me.cbxFR = New System.Windows.Forms.CheckBox()
-        Me.UsrCntlKundenAvisoMailBenachrichtigung1 = New SDL.usrCntlKundenAvisoMailBenachrichtigung()
-        Me.usrCntlAufschubkonten = New SDL.usrCntlAufschubkonten()
-        Me.UsrCntlKundeFiskaldaten1 = New SDL.usrCntlKundeFiskaldaten()
         Me.tbcntrDetails.SuspendLayout()
         Me.tbAbfertigung.SuspendLayout()
         Me.tbcntrAbf.SuspendLayout()
@@ -577,6 +579,16 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.cbxBesonderheitenNEU.Text = "Besonderheiten NEU"
         Me.cbxBesonderheitenNEU.UseVisualStyleBackColor = True
         '
+        'UsrCntlKundenBesonderheiten1
+        '
+        Me.UsrCntlKundenBesonderheiten1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlKundenBesonderheiten1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.UsrCntlKundenBesonderheiten1.Location = New System.Drawing.Point(6, 25)
+        Me.UsrCntlKundenBesonderheiten1.Name = "UsrCntlKundenBesonderheiten1"
+        Me.UsrCntlKundenBesonderheiten1.Size = New System.Drawing.Size(107, 52)
+        Me.UsrCntlKundenBesonderheiten1.TabIndex = 235
+        Me.UsrCntlKundenBesonderheiten1.Visible = False
+        '
         'tbcntrAbf
         '
         Me.tbcntrAbf.Controls.Add(Me.TabPage4)
@@ -611,6 +623,15 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.FlowLayoutPanel1.Size = New System.Drawing.Size(200, 100)
         Me.FlowLayoutPanel1.TabIndex = 7
         '
+        'UsrCntlKundenAvisoMailBenachrichtigung1
+        '
+        Me.UsrCntlKundenAvisoMailBenachrichtigung1.AutoScroll = True
+        Me.UsrCntlKundenAvisoMailBenachrichtigung1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlKundenAvisoMailBenachrichtigung1.Location = New System.Drawing.Point(0, 6)
+        Me.UsrCntlKundenAvisoMailBenachrichtigung1.Name = "UsrCntlKundenAvisoMailBenachrichtigung1"
+        Me.UsrCntlKundenAvisoMailBenachrichtigung1.Size = New System.Drawing.Size(479, 172)
+        Me.UsrCntlKundenAvisoMailBenachrichtigung1.TabIndex = 6
+        '
         'rtbLKWFreigabeSenden
         '
         Me.rtbLKWFreigabeSenden.Location = New System.Drawing.Point(485, 33)
@@ -779,6 +800,14 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.tbAufschub.Text = "Aufschubkonten"
         Me.tbAufschub.UseVisualStyleBackColor = True
         '
+        'usrCntlAufschubkonten
+        '
+        Me.usrCntlAufschubkonten.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.usrCntlAufschubkonten.Location = New System.Drawing.Point(3, 3)
+        Me.usrCntlAufschubkonten.Name = "usrCntlAufschubkonten"
+        Me.usrCntlAufschubkonten.Size = New System.Drawing.Size(652, 172)
+        Me.usrCntlAufschubkonten.TabIndex = 0
+        '
         'TabPage1
         '
         Me.TabPage1.Controls.Add(Me.Label78)
@@ -1084,6 +1113,15 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.tbFiskal.Text = "Fiskal"
         Me.tbFiskal.UseVisualStyleBackColor = True
         '
+        'UsrCntlKundeFiskaldaten1
+        '
+        Me.UsrCntlKundeFiskaldaten1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlKundeFiskaldaten1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrCntlKundeFiskaldaten1.Location = New System.Drawing.Point(0, 0)
+        Me.UsrCntlKundeFiskaldaten1.Name = "UsrCntlKundeFiskaldaten1"
+        Me.UsrCntlKundeFiskaldaten1.Size = New System.Drawing.Size(672, 495)
+        Me.UsrCntlKundeFiskaldaten1.TabIndex = 0
+        '
         'tbVerrechnung
         '
         Me.tbVerrechnung.Controls.Add(Me.pnlverag360)
@@ -1145,13 +1183,15 @@ Partial Class usrcntlKundeBearbeitenFull
         '
         'pnlverag360
         '
+        Me.pnlverag360.Controls.Add(Me.txtFR)
+        Me.pnlverag360.Controls.Add(Me.cbxFR)
         Me.pnlverag360.Controls.Add(Me.txtAnmerkungAntraege)
         Me.pnlverag360.Controls.Add(Me.gbMWSTAntraege)
         Me.pnlverag360.Controls.Add(Me.txtVorauszahlung)
         Me.pnlverag360.Controls.Add(Me.cbxVorauszahlung)
         Me.pnlverag360.Location = New System.Drawing.Point(417, 247)
         Me.pnlverag360.Name = "pnlverag360"
-        Me.pnlverag360.Size = New System.Drawing.Size(252, 143)
+        Me.pnlverag360.Size = New System.Drawing.Size(252, 169)
         Me.pnlverag360.TabIndex = 49
         '
         'txtAnmerkungAntraege
@@ -5040,6 +5080,14 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.TabPage11.Text = "Spezifisch"
         Me.TabPage11.UseVisualStyleBackColor = True
         '
+        'ucKundenKontakte
+        '
+        Me.ucKundenKontakte.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.ucKundenKontakte.Location = New System.Drawing.Point(3, 3)
+        Me.ucKundenKontakte.Name = "ucKundenKontakte"
+        Me.ucKundenKontakte.Size = New System.Drawing.Size(439, 169)
+        Me.ucKundenKontakte.TabIndex = 0
+        '
         'Label50
         '
         Me.Label50.AutoSize = True
@@ -5320,49 +5368,40 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.DataGridViewTextBoxColumn2.HeaderText = "E-Mail"
         Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2"
         '
-        'ucKundenKontakte
+        'txtFR
         '
-        Me.ucKundenKontakte.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.txtFR._DateTimeOnly = False
-        Me.ucKundenKontakte.Location = New System.Drawing.Point(3, 3)
+        Me.txtFR._numbersOnly = False
-        Me.ucKundenKontakte.Name = "ucKundenKontakte"
+        Me.txtFR._numbersOnlyKommastellen = ""
-        Me.ucKundenKontakte.Size = New System.Drawing.Size(439, 169)
+        Me.txtFR._numbersOnlyTrennzeichen = False
-        Me.ucKundenKontakte.TabIndex = 0
+        Me.txtFR._Prozent = False
+        Me.txtFR._ShortDateNew = False
+        Me.txtFR._ShortDateOnly = False
+        Me.txtFR._TimeOnly = False
+        Me.txtFR._TimeOnly_Seconds = False
+        Me.txtFR._value = ""
+        Me.txtFR._Waehrung = False
+        Me.txtFR._WaehrungZeichen = False
+        Me.txtFR.ForeColor = System.Drawing.Color.Red
+        Me.txtFR.Location = New System.Drawing.Point(110, 146)
+        Me.txtFR.MaxLength = 10
+        Me.txtFR.MaxLineLength = -1
+        Me.txtFR.MaxLines_Warning = ""
+        Me.txtFR.MaxLines_Warning_Label = Nothing
+        Me.txtFR.Name = "txtFR"
+        Me.txtFR.Size = New System.Drawing.Size(123, 20)
+        Me.txtFR.TabIndex = 51
         '
-        'UsrCntlKundenBesonderheiten1
+        'cbxFR
         '
-        Me.UsrCntlKundenBesonderheiten1.BackColor = System.Drawing.Color.White
+        Me.cbxFR.AutoSize = True
-        Me.UsrCntlKundenBesonderheiten1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.cbxFR.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.UsrCntlKundenBesonderheiten1.Location = New System.Drawing.Point(6, 25)
+        Me.cbxFR.Location = New System.Drawing.Point(8, 146)
-        Me.UsrCntlKundenBesonderheiten1.Name = "UsrCntlKundenBesonderheiten1"
+        Me.cbxFR.Name = "cbxFR"
-        Me.UsrCntlKundenBesonderheiten1.Size = New System.Drawing.Size(107, 52)
+        Me.cbxFR.Size = New System.Drawing.Size(100, 17)
-        Me.UsrCntlKundenBesonderheiten1.TabIndex = 235
+        Me.cbxFR.TabIndex = 50
-        Me.UsrCntlKundenBesonderheiten1.Visible = False
+        Me.cbxFR.Text = "Fremdrechnung"
-        '
+        Me.cbxFR.UseVisualStyleBackColor = True
-        'UsrCntlKundenAvisoMailBenachrichtigung1
-        '
-        Me.UsrCntlKundenAvisoMailBenachrichtigung1.AutoScroll = True
-        Me.UsrCntlKundenAvisoMailBenachrichtigung1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlKundenAvisoMailBenachrichtigung1.Location = New System.Drawing.Point(0, 6)
-        Me.UsrCntlKundenAvisoMailBenachrichtigung1.Name = "UsrCntlKundenAvisoMailBenachrichtigung1"
-        Me.UsrCntlKundenAvisoMailBenachrichtigung1.Size = New System.Drawing.Size(479, 172)
-        Me.UsrCntlKundenAvisoMailBenachrichtigung1.TabIndex = 6
-        '
-        'usrCntlAufschubkonten
-        '
-        Me.usrCntlAufschubkonten.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.usrCntlAufschubkonten.Location = New System.Drawing.Point(3, 3)
-        Me.usrCntlAufschubkonten.Name = "usrCntlAufschubkonten"
-        Me.usrCntlAufschubkonten.Size = New System.Drawing.Size(652, 172)
-        Me.usrCntlAufschubkonten.TabIndex = 0
-        '
-        'UsrCntlKundeFiskaldaten1
-        '
-        Me.UsrCntlKundeFiskaldaten1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlKundeFiskaldaten1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrCntlKundeFiskaldaten1.Location = New System.Drawing.Point(0, 0)
-        Me.UsrCntlKundeFiskaldaten1.Name = "UsrCntlKundeFiskaldaten1"
-        Me.UsrCntlKundeFiskaldaten1.Size = New System.Drawing.Size(672, 495)
-        Me.UsrCntlKundeFiskaldaten1.TabIndex = 0
         '
         'usrcntlKundeBearbeitenFull
         '
@@ -5812,4 +5851,6 @@ Partial Class usrcntlKundeBearbeitenFull
     Friend WithEvents txtAnmerkungAntraege As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents dgvMWST As DataGridView
     Friend WithEvents btnMWSTspeichern As VERAG_PROG_ALLGEMEIN.FlatButton
+    Friend WithEvents txtFR As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents cbxFR As CheckBox
 End Class

SDL/kunden/usrcntlKundeBearbeitenFull.vb

@@ -203,6 +203,8 @@
         txtHandelsregisterNr.Text = loadValue(KUNDE_ERW.kde_HRNr, "")
         cbxVorauszahlung.Checked = loadValue(KUNDE_ERW.kde_VZ, False)
         txtVorauszahlung.Text = loadValue(KUNDE_ERW.kde_AnmerkungVZ, "")
+        cbxFR.Checked = loadValue(KUNDE_ERW.kde_FR, False)
+        txtFR.Text = loadValue(KUNDE_ERW.kde_AnmerkungFR, "")
         txtAnmerkungAntraege.Text = loadValue(KUNDE_ERW.kde_AnmerkungAntrag, "")
 
         txtEORI.Text = If(KUNDE.EORITIN, "")
@@ -621,6 +623,8 @@
         KUNDE_ERW.kde_VZ = cbxVorauszahlung.Checked
         KUNDE_ERW.kde_AnmerkungVZ = txtVorauszahlung.Text
         KUNDE_ERW.kde_AnmerkungAntrag = txtAnmerkungAntraege.Text
+        KUNDE_ERW.kde_FR = cbxFR.Checked
+        KUNDE_ERW.kde_AnmerkungFR = txtFR.Text
 
         If isLeerNothing(txtGruendungsDatum.Text) IsNot Nothing AndAlso IsDate(txtGruendungsDatum.Text) Then
             KUNDE_ERW.kde_GruendungsDatum = CDate(txtGruendungsDatum.Text)

VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/usrcntlPDFScanList.vb

@@ -137,7 +137,7 @@ Public Class usrcntlPDFScanList
                 If DS.uploadDataToDATENSERVER_fromBytes(frmScan.ReturnValue, Filename, ".pdf") Then
                     If DS.DATA_LIST.LIST.Count > 0 Then
                         Dim l As VERAG_PROG_ALLGEMEIN.cDatenarchiv_Collection = DS.DATA_LIST.LIST(DS.DATA_LIST.LIST.Count - 1)
-                        RaiseEvent FileAdded(l.coll_id, l.coll_pfad, l.coll_bezeichnung)
+                        RaiseEvent FileAdded(l.coll_daId, l.coll_pfad, l.coll_bezeichnung)
                     End If
                 End If
 

VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb

@@ -91,6 +91,8 @@ Public Class cKundenErweitert
     Property kde_MWStAbrechnung As String = "Q"
     Property kde_AnmerkungVZ As Object = Nothing
     Property kde_VZ As Boolean = False
+    Property kde_AnmerkungFR As Object = Nothing
+    Property kde_FR As Boolean = False
     Property kde_AnmerkungAntrag As Object = Nothing
 
 
@@ -186,6 +188,8 @@ Public Class cKundenErweitert
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_AnmerkungVZ", kde_AnmerkungVZ))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_VZ", kde_VZ))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_AnmerkungAntrag", kde_AnmerkungAntrag))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_AnmerkungFR", kde_AnmerkungFR))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_FR", kde_FR))
 
         Return list
     End Function