diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 9858e89f..78022689 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/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.Rows.Count <> 0 And counter <> dgvUSTVPositionen.Rows.Count) And counter <> 1 Then posId &= "," Next diff --git a/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb b/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb index 2e362c0e..7a4cc9b4 100644 --- a/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb +++ b/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!) diff --git a/SDL/USTV/ustCntlUSTV_AntragPosition.vb b/SDL/USTV/ustCntlUSTV_AntragPosition.vb index a4681b2b..33d9368f 100644 --- a/SDL/USTV/ustCntlUSTV_AntragPosition.vb +++ b/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 diff --git a/SDL/kunden/usrcntlFiskaluebersicht.vb b/SDL/kunden/usrcntlFiskaluebersicht.vb index 4ec86086..79b974b6 100644 --- a/SDL/kunden/usrcntlFiskaluebersicht.vb +++ b/SDL/kunden/usrcntlFiskaluebersicht.vb @@ -1,10 +1,5 @@ - -Imports System.Globalization -Imports System.Linq.Expressions -Imports System.Net +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