From 7ba4fdf8f11e32d93f777ba642ad257e99650d93 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 8 May 2024 09:37:40 +0200 Subject: [PATCH] =?UTF-8?q?div.=20=C3=84nderungen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frmAbrechnungsMaske.Designer.vb | 223 ++++++++++-------- SDL/Fakturierung/frmAbrechnungsMaske.vb | 9 + .../frmRechnungenSuche.Designer.vb | 31 ++- SDL/Fakturierung/frmRechnungenSuche.resx | 3 + SDL/Fakturierung/frmRechnungenSuche.vb | 5 + SDL/Fakturierung/usrCntlFaktAbrechnung.vb | 4 + .../FormulareBaukasten/usrcntlEORI_Antrag.vb | 8 +- VERAG_PROG_ALLGEMEIN/Classes/cAdressen.vb | 25 +- VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb | 7 +- .../Finanzonline/cFinanzOnlineWebService.vb | 15 +- 10 files changed, 205 insertions(+), 125 deletions(-) diff --git a/SDL/Fakturierung/frmAbrechnungsMaske.Designer.vb b/SDL/Fakturierung/frmAbrechnungsMaske.Designer.vb index f80c0054..b36a67f3 100644 --- a/SDL/Fakturierung/frmAbrechnungsMaske.Designer.vb +++ b/SDL/Fakturierung/frmAbrechnungsMaske.Designer.vb @@ -30,9 +30,12 @@ Partial Class frmAbrechnungsMaske Me.TabPage1 = New System.Windows.Forms.TabPage() Me.Button4 = New System.Windows.Forms.Button() Me.Label12 = New System.Windows.Forms.Label() + Me.dgvRechnungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel2 = New System.Windows.Forms.Panel() Me.Button11 = New System.Windows.Forms.Button() Me.cbxOriginalDrucken = New System.Windows.Forms.CheckBox() + Me.cboSort = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cboPrinter = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Button9 = New System.Windows.Forms.Button() Me.Button8 = New System.Windows.Forms.Button() Me.Button7 = New System.Windows.Forms.Button() @@ -48,19 +51,16 @@ Partial Class frmAbrechnungsMaske Me.Label2 = New System.Windows.Forms.Label() Me.Label10 = New System.Windows.Forms.Label() Me.Panel1 = New System.Windows.Forms.Panel() + Me.PictureBox5 = New System.Windows.Forms.PictureBox() + Me.cbxGutschriftenAnVerag = New System.Windows.Forms.CheckBox() + Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label14 = New System.Windows.Forms.Label() Me.cbx = New System.Windows.Forms.CheckBox() + Me.MyComboBox3 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label5 = New System.Windows.Forms.Label() + Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label1 = New System.Windows.Forms.Label() Me.lblSachbearbeiter = New System.Windows.Forms.Label() - Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.cbxGutschriftenAnVerag = New System.Windows.Forms.CheckBox() - Me.dgvRechnungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.cboSort = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.cboPrinter = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.MyComboBox3 = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -85,6 +85,7 @@ Partial Class frmAbrechnungsMaske Me.btnBisJahr = New System.Windows.Forms.Button() Me.btnVonJahr = New System.Windows.Forms.Button() Me.UsrCntlFaktAbrechnung1 = New SDL.usrCntlFaktAbrechnung() + Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.pnl.SuspendLayout() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer.Panel1.SuspendLayout() @@ -92,9 +93,10 @@ Partial Class frmAbrechnungsMaske Me.SplitContainer.SuspendLayout() Me.tbcntr.SuspendLayout() Me.TabPage1.SuspendLayout() + CType(Me.dgvRechnungen, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel2.SuspendLayout() Me.Panel1.SuspendLayout() - CType(Me.dgvRechnungen, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() Me.MyPanel1.SuspendLayout() Me.SuspendLayout() ' @@ -174,6 +176,25 @@ Partial Class frmAbrechnungsMaske Me.Label12.TextAlign = System.Drawing.ContentAlignment.TopCenter Me.Label12.Visible = False ' + 'dgvRechnungen + ' + Me.dgvRechnungen.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvRechnungen.AllowUserToAddRows = False + Me.dgvRechnungen.AllowUserToDeleteRows = False + Me.dgvRechnungen.AllowUserToResizeColumns = False + Me.dgvRechnungen.AllowUserToResizeRows = False + Me.dgvRechnungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvRechnungen.Dock = System.Windows.Forms.DockStyle.Fill + Me.dgvRechnungen.Location = New System.Drawing.Point(3, 3) + Me.dgvRechnungen.Margin = New System.Windows.Forms.Padding(2) + Me.dgvRechnungen.Name = "dgvRechnungen" + Me.dgvRechnungen.ReadOnly = True + Me.dgvRechnungen.RowHeadersVisible = False + Me.dgvRechnungen.RowTemplate.Height = 28 + Me.dgvRechnungen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvRechnungen.Size = New System.Drawing.Size(561, 316) + Me.dgvRechnungen.TabIndex = 1 + ' 'Panel2 ' Me.Panel2.BackColor = System.Drawing.Color.White @@ -227,6 +248,30 @@ Partial Class frmAbrechnungsMaske Me.cbxOriginalDrucken.Text = "Original (ohne ""Kopie"")" Me.cbxOriginalDrucken.UseVisualStyleBackColor = True ' + 'cboSort + ' + Me.cboSort._allowedValuesFreiText = Nothing + Me.cboSort._allowFreiText = False + Me.cboSort._value = "" + Me.cboSort.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboSort.FormattingEnabled = True + Me.cboSort.Location = New System.Drawing.Point(8, 73) + Me.cboSort.Name = "cboSort" + Me.cboSort.Size = New System.Drawing.Size(53, 21) + Me.cboSort.TabIndex = 26 + ' + 'cboPrinter + ' + Me.cboPrinter._allowedValuesFreiText = Nothing + Me.cboPrinter._allowFreiText = False + Me.cboPrinter._value = "" + Me.cboPrinter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboPrinter.FormattingEnabled = True + Me.cboPrinter.Location = New System.Drawing.Point(142, 52) + Me.cboPrinter.Name = "cboPrinter" + Me.cboPrinter.Size = New System.Drawing.Size(157, 21) + Me.cboPrinter.TabIndex = 25 + ' 'Button9 ' Me.Button9.BackgroundImage = Global.SDL.My.Resources.Resources.pdf @@ -395,6 +440,7 @@ Partial Class frmAbrechnungsMaske 'Panel1 ' Me.Panel1.BackColor = System.Drawing.Color.White + Me.Panel1.Controls.Add(Me.PictureBox5) Me.Panel1.Controls.Add(Me.cbxGutschriftenAnVerag) Me.Panel1.Controls.Add(Me.MyComboBox1) Me.Panel1.Controls.Add(Me.Label14) @@ -413,6 +459,38 @@ Partial Class frmAbrechnungsMaske Me.Panel1.Size = New System.Drawing.Size(575, 170) Me.Panel1.TabIndex = 0 ' + 'PictureBox5 + ' + Me.PictureBox5.BackgroundImage = Global.SDL.My.Resources.Resources.fragezeichen + Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox5.Location = New System.Drawing.Point(543, 3) + Me.PictureBox5.Name = "PictureBox5" + Me.PictureBox5.Size = New System.Drawing.Size(28, 29) + Me.PictureBox5.TabIndex = 133 + Me.PictureBox5.TabStop = False + ' + 'cbxGutschriftenAnVerag + ' + Me.cbxGutschriftenAnVerag.AutoSize = True + Me.cbxGutschriftenAnVerag.Location = New System.Drawing.Point(15, 59) + Me.cbxGutschriftenAnVerag.Name = "cbxGutschriftenAnVerag" + Me.cbxGutschriftenAnVerag.Size = New System.Drawing.Size(128, 17) + Me.cbxGutschriftenAnVerag.TabIndex = 54 + Me.cbxGutschriftenAnVerag.Text = "nicht an Verag abger." + Me.cbxGutschriftenAnVerag.UseVisualStyleBackColor = True + ' + 'MyComboBox1 + ' + Me.MyComboBox1._allowedValuesFreiText = Nothing + Me.MyComboBox1._allowFreiText = False + Me.MyComboBox1._value = "" + Me.MyComboBox1.FormattingEnabled = True + Me.MyComboBox1.Location = New System.Drawing.Point(453, 28) + Me.MyComboBox1.Margin = New System.Windows.Forms.Padding(2) + Me.MyComboBox1.Name = "MyComboBox1" + Me.MyComboBox1.Size = New System.Drawing.Size(83, 21) + Me.MyComboBox1.TabIndex = 53 + ' 'Label14 ' Me.Label14.AutoSize = True @@ -434,6 +512,18 @@ Partial Class frmAbrechnungsMaske Me.cbx.Text = "Gedruckte Rechnugen anzeigen" Me.cbx.UseVisualStyleBackColor = True ' + 'MyComboBox3 + ' + Me.MyComboBox3._allowedValuesFreiText = Nothing + Me.MyComboBox3._allowFreiText = False + Me.MyComboBox3._value = "" + Me.MyComboBox3.FormattingEnabled = True + Me.MyComboBox3.Location = New System.Drawing.Point(453, 8) + Me.MyComboBox3.Margin = New System.Windows.Forms.Padding(2) + Me.MyComboBox3.Name = "MyComboBox3" + Me.MyComboBox3.Size = New System.Drawing.Size(83, 21) + Me.MyComboBox3.TabIndex = 33 + ' 'Label5 ' Me.Label5.AutoSize = True @@ -443,6 +533,18 @@ Partial Class frmAbrechnungsMaske Me.Label5.TabIndex = 32 Me.Label5.Text = "Sammel-/Einzel-Rg.:" ' + 'MyComboBox2 + ' + Me.MyComboBox2._allowedValuesFreiText = Nothing + Me.MyComboBox2._allowFreiText = False + Me.MyComboBox2._value = "" + Me.MyComboBox2.FormattingEnabled = True + Me.MyComboBox2.Location = New System.Drawing.Point(99, 33) + Me.MyComboBox2.Margin = New System.Windows.Forms.Padding(2) + Me.MyComboBox2.Name = "MyComboBox2" + Me.MyComboBox2.Size = New System.Drawing.Size(154, 21) + Me.MyComboBox2.TabIndex = 31 + ' 'Label1 ' Me.Label1.AutoSize = True @@ -461,100 +563,6 @@ Partial Class frmAbrechnungsMaske Me.lblSachbearbeiter.TabIndex = 30 Me.lblSachbearbeiter.Text = "Sachbearbeiter:" ' - 'ContextMenuStrip1 - ' - Me.ContextMenuStrip1.Name = "ContextMenuStrip1" - Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4) - ' - 'cbxGutschriftenAnVerag - ' - Me.cbxGutschriftenAnVerag.AutoSize = True - Me.cbxGutschriftenAnVerag.Location = New System.Drawing.Point(15, 59) - Me.cbxGutschriftenAnVerag.Name = "cbxGutschriftenAnVerag" - Me.cbxGutschriftenAnVerag.Size = New System.Drawing.Size(128, 17) - Me.cbxGutschriftenAnVerag.TabIndex = 54 - Me.cbxGutschriftenAnVerag.Text = "nicht an Verag abger." - Me.cbxGutschriftenAnVerag.UseVisualStyleBackColor = True - ' - 'dgvRechnungen - ' - Me.dgvRechnungen.AKTUALISIERUNGS_INTERVALL = -1 - Me.dgvRechnungen.AllowUserToAddRows = False - Me.dgvRechnungen.AllowUserToDeleteRows = False - Me.dgvRechnungen.AllowUserToResizeColumns = False - Me.dgvRechnungen.AllowUserToResizeRows = False - Me.dgvRechnungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvRechnungen.Dock = System.Windows.Forms.DockStyle.Fill - Me.dgvRechnungen.Location = New System.Drawing.Point(3, 3) - Me.dgvRechnungen.Margin = New System.Windows.Forms.Padding(2) - Me.dgvRechnungen.Name = "dgvRechnungen" - Me.dgvRechnungen.ReadOnly = True - Me.dgvRechnungen.RowHeadersVisible = False - Me.dgvRechnungen.RowTemplate.Height = 28 - Me.dgvRechnungen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvRechnungen.Size = New System.Drawing.Size(561, 316) - Me.dgvRechnungen.TabIndex = 1 - ' - 'cboSort - ' - Me.cboSort._allowedValuesFreiText = Nothing - Me.cboSort._allowFreiText = False - Me.cboSort._value = "" - Me.cboSort.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboSort.FormattingEnabled = True - Me.cboSort.Location = New System.Drawing.Point(8, 73) - Me.cboSort.Name = "cboSort" - Me.cboSort.Size = New System.Drawing.Size(53, 21) - Me.cboSort.TabIndex = 26 - ' - 'cboPrinter - ' - Me.cboPrinter._allowedValuesFreiText = Nothing - Me.cboPrinter._allowFreiText = False - Me.cboPrinter._value = "" - Me.cboPrinter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboPrinter.FormattingEnabled = True - Me.cboPrinter.Location = New System.Drawing.Point(142, 52) - Me.cboPrinter.Name = "cboPrinter" - Me.cboPrinter.Size = New System.Drawing.Size(157, 21) - Me.cboPrinter.TabIndex = 25 - ' - 'MyComboBox1 - ' - Me.MyComboBox1._allowedValuesFreiText = Nothing - Me.MyComboBox1._allowFreiText = False - Me.MyComboBox1._value = "" - Me.MyComboBox1.FormattingEnabled = True - Me.MyComboBox1.Location = New System.Drawing.Point(453, 28) - Me.MyComboBox1.Margin = New System.Windows.Forms.Padding(2) - Me.MyComboBox1.Name = "MyComboBox1" - Me.MyComboBox1.Size = New System.Drawing.Size(83, 21) - Me.MyComboBox1.TabIndex = 53 - ' - 'MyComboBox3 - ' - Me.MyComboBox3._allowedValuesFreiText = Nothing - Me.MyComboBox3._allowFreiText = False - Me.MyComboBox3._value = "" - Me.MyComboBox3.FormattingEnabled = True - Me.MyComboBox3.Location = New System.Drawing.Point(453, 8) - Me.MyComboBox3.Margin = New System.Windows.Forms.Padding(2) - Me.MyComboBox3.Name = "MyComboBox3" - Me.MyComboBox3.Size = New System.Drawing.Size(83, 21) - Me.MyComboBox3.TabIndex = 33 - ' - 'MyComboBox2 - ' - Me.MyComboBox2._allowedValuesFreiText = Nothing - Me.MyComboBox2._allowFreiText = False - Me.MyComboBox2._value = "" - Me.MyComboBox2.FormattingEnabled = True - Me.MyComboBox2.Location = New System.Drawing.Point(99, 33) - Me.MyComboBox2.Margin = New System.Windows.Forms.Padding(2) - Me.MyComboBox2.Name = "MyComboBox2" - Me.MyComboBox2.Size = New System.Drawing.Size(154, 21) - Me.MyComboBox2.TabIndex = 31 - ' 'cboFirma ' Me.cboFirma._allowedValuesFreiText = Nothing @@ -920,6 +928,11 @@ Partial Class frmAbrechnungsMaske Me.UsrCntlFaktAbrechnung1.Size = New System.Drawing.Size(863, 615) Me.UsrCntlFaktAbrechnung1.TabIndex = 0 ' + 'ContextMenuStrip1 + ' + Me.ContextMenuStrip1.Name = "ContextMenuStrip1" + Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4) + ' 'frmAbrechnungsMaske ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -938,11 +951,12 @@ Partial Class frmAbrechnungsMaske Me.SplitContainer.ResumeLayout(False) Me.tbcntr.ResumeLayout(False) Me.TabPage1.ResumeLayout(False) + CType(Me.dgvRechnungen, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel2.ResumeLayout(False) Me.Panel2.PerformLayout() Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() - CType(Me.dgvRechnungen, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit() Me.MyPanel1.ResumeLayout(False) Me.MyPanel1.PerformLayout() Me.ResumeLayout(False) @@ -1009,4 +1023,5 @@ Partial Class frmAbrechnungsMaske Friend WithEvents Button11 As Button Friend WithEvents ContextMenuStrip1 As ContextMenuStrip Friend WithEvents cbxGutschriftenAnVerag As CheckBox + Friend WithEvents PictureBox5 As PictureBox End Class diff --git a/SDL/Fakturierung/frmAbrechnungsMaske.vb b/SDL/Fakturierung/frmAbrechnungsMaske.vb index d0c6e4a2..d1166024 100644 --- a/SDL/Fakturierung/frmAbrechnungsMaske.vb +++ b/SDL/Fakturierung/frmAbrechnungsMaske.vb @@ -49,6 +49,10 @@ Public Class frmAbrechnungsMaske FirmaTmp = "VERAGIMEX" End If + If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then + FirmaTmp = "AMBAR" + End If + MyComboBox2.Items.Clear() Select Case FirmaTmp @@ -785,4 +789,9 @@ Public Class frmAbrechnungsMaske MyPanel1.Visible = False initDGV() End Sub + + Private Sub PictureBox5_Click(sender As Object, e As EventArgs) Handles PictureBox5.Click + Dim webAddress As String = "https://wiki.verag.ag/de/abteilungen/verrechnung/xxxx" + Process.Start(webAddress) + End Sub End Class \ No newline at end of file diff --git a/SDL/Fakturierung/frmRechnungenSuche.Designer.vb b/SDL/Fakturierung/frmRechnungenSuche.Designer.vb index 1c67af97..6759b761 100644 --- a/SDL/Fakturierung/frmRechnungenSuche.Designer.vb +++ b/SDL/Fakturierung/frmRechnungenSuche.Designer.vb @@ -104,6 +104,7 @@ Partial Class frmRechnungenSuche Me.cntxtCntxtSpeditionsbuch = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.EintragLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.pnlOpt = New System.Windows.Forms.Panel() + Me.lblunterschRe = New System.Windows.Forms.Label() Me.Label17 = New System.Windows.Forms.Label() Me.txtMaxSrch = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.pnlBerichte = New System.Windows.Forms.Panel() @@ -132,7 +133,7 @@ Partial Class frmRechnungenSuche Me.Label4 = New System.Windows.Forms.Label() Me.pnlTop = New System.Windows.Forms.Panel() Me.TestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.lblunterschRe = New System.Windows.Forms.Label() + Me.PictureBox5 = New System.Windows.Forms.PictureBox() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer.Panel1.SuspendLayout() Me.SplitContainer.Panel2.SuspendLayout() @@ -152,6 +153,7 @@ Partial Class frmRechnungenSuche Me.pnl.SuspendLayout() Me.ctxtRg.SuspendLayout() Me.pnlTop.SuspendLayout() + CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'SplitContainer @@ -1487,6 +1489,15 @@ Partial Class frmRechnungenSuche Me.pnlOpt.Size = New System.Drawing.Size(1327, 70) Me.pnlOpt.TabIndex = 1 ' + 'lblunterschRe + ' + Me.lblunterschRe.Location = New System.Drawing.Point(1164, 2) + Me.lblunterschRe.Name = "lblunterschRe" + Me.lblunterschRe.Size = New System.Drawing.Size(162, 20) + Me.lblunterschRe.TabIndex = 45 + Me.lblunterschRe.Text = "Anz untersch. Belege: 0" + Me.lblunterschRe.TextAlign = System.Drawing.ContentAlignment.TopRight + ' 'Label17 ' Me.Label17.AutoSize = True @@ -1785,6 +1796,7 @@ Partial Class frmRechnungenSuche 'pnlTop ' Me.pnlTop.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.pnlTop.Controls.Add(Me.PictureBox5) Me.pnlTop.Controls.Add(Me.Label4) Me.pnlTop.Controls.Add(Me.Label22) Me.pnlTop.Dock = System.Windows.Forms.DockStyle.Top @@ -1799,14 +1811,15 @@ Partial Class frmRechnungenSuche Me.TestToolStripMenuItem.Size = New System.Drawing.Size(150, 19) Me.TestToolStripMenuItem.Text = "test" ' - 'lblunterschRe + 'PictureBox5 ' - Me.lblunterschRe.Location = New System.Drawing.Point(1164, 2) - Me.lblunterschRe.Name = "lblunterschRe" - Me.lblunterschRe.Size = New System.Drawing.Size(162, 20) - Me.lblunterschRe.TabIndex = 45 - Me.lblunterschRe.Text = "Anz untersch. Belege: 0" - Me.lblunterschRe.TextAlign = System.Drawing.ContentAlignment.TopRight + Me.PictureBox5.BackgroundImage = Global.SDL.My.Resources.Resources.fragezeichen + Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox5.Location = New System.Drawing.Point(1291, 10) + Me.PictureBox5.Name = "PictureBox5" + Me.PictureBox5.Size = New System.Drawing.Size(28, 29) + Me.PictureBox5.TabIndex = 133 + Me.PictureBox5.TabStop = False ' 'frmRechnungenSuche ' @@ -1846,6 +1859,7 @@ Partial Class frmRechnungenSuche Me.ctxtRg.ResumeLayout(False) Me.pnlTop.ResumeLayout(False) Me.pnlTop.PerformLayout() + CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -1958,4 +1972,5 @@ Partial Class frmRechnungenSuche Friend WithEvents ctxtRg As ContextMenuStrip Friend WithEvents DateiHochladenToolStripMenuItem As ToolStripMenuItem Friend WithEvents lblunterschRe As Label + Friend WithEvents PictureBox5 As PictureBox End Class diff --git a/SDL/Fakturierung/frmRechnungenSuche.resx b/SDL/Fakturierung/frmRechnungenSuche.resx index dada05ee..2bac4988 100644 --- a/SDL/Fakturierung/frmRechnungenSuche.resx +++ b/SDL/Fakturierung/frmRechnungenSuche.resx @@ -126,6 +126,9 @@ 316, 17 + + 316, 17 + diff --git a/SDL/Fakturierung/frmRechnungenSuche.vb b/SDL/Fakturierung/frmRechnungenSuche.vb index 832cd18c..c83f6942 100644 --- a/SDL/Fakturierung/frmRechnungenSuche.vb +++ b/SDL/Fakturierung/frmRechnungenSuche.vb @@ -878,4 +878,9 @@ Public Class frmRechnungenSuche Private Sub DataGridView_SelectionChanged(sender As Object, e As EventArgs) Handles DataGridView.SelectionChanged btnPDF.Enabled = (DataGridView.SelectedRows.Count > 0) End Sub + + Private Sub PictureBox5_Click(sender As Object, e As EventArgs) Handles PictureBox5.Click + Dim webAddress As String = "https://wiki.verag.ag/de/abteilungen/verrechnung/xxxx" + Process.Start(webAddress) + End Sub End Class \ No newline at end of file diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb index f6b0c98b..e4f6fdd2 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb @@ -539,6 +539,10 @@ Public Class usrCntlFaktAbrechnung FirmaTmp = "VERAGIMEX" End If + If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then + FirmaTmp = "AMBAR" + End If + Select Case FirmaTmp Case "VERAG" If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGAG_DE", "SDL") Then diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.vb index abdf4147..f8893244 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.vb @@ -92,11 +92,13 @@ Dim KUNDE As New VERAG_PROG_ALLGEMEIN.cKunde(KdNR) Dim ADRESSE As New VERAG_PROG_ALLGEMEIN.cAdressen(KdNR) - txtFirma.Text = If(ADRESSE.Name_1, "") & If(If(ADRESSE.Name_2, "") <> "", " " & ADRESSE.Name_2, "") - txtAdresse1.Text = If(ADRESSE.Straße, "") + + + txtFirma.Text = VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(If(ADRESSE.Name_1, "") & If(If(ADRESSE.Name_2, "") <> "", " " & ADRESSE.Name_2, "")) + txtAdresse1.Text = VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(If(ADRESSE.Straße, "")) txtLand.Text = If(ADRESSE.LandKz, "") txtPLZ.Text = If(ADRESSE.PLZ, "") - txtOrt.Text = If(ADRESSE.Ort, "").ToString.Trim + txtOrt.Text = VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(If(ADRESSE.Ort, "").ToString.Trim) txtUid.Text = If(ADRESSE.UstIdKz, "") & If(ADRESSE.UstIdNr, "") txtEori.Text = If(KUNDE.EORITIN, "") txtTel.Text = If(ADRESSE.Telefon, "") diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cAdressen.vb b/VERAG_PROG_ALLGEMEIN/Classes/cAdressen.vb index d0171ab7..bd1c8989 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cAdressen.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cAdressen.vb @@ -228,11 +228,32 @@ Public Class cAdressen Return id > 0 End Function + Public Function UpdateSpecialField(field, value) As Boolean + If field = "" Then Return False + + Dim itemFound = False + For Each s In getParameterList() + If s.Scalarvariable = field AndAlso value IsNot Nothing Then + itemFound = True + Exit For + End If + Next + + If Not itemFound Then Return False + + Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM Adressen WHERE AdressenNr= " & AdressenNr & ") " & + " BEGIN UPDATE [Adressen] SET " & field & " = '" & value & "' WHERE AdressenNr=" & AdressenNr & " End " & + " commit tran " + + Return SQL.doSQL(sqlstr, "FMZOLL") + + End Function + Public Sub LOAD() Dim test = "" Try Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL(False) - Using cmd As New SqlCommand("SELECT * FROM Adressen WHERE AdressenNr=@AdressenNr ", conn) + Using cmd As New SqlCommand("Select * FROM Adressen WHERE AdressenNr=@AdressenNr ", conn) cmd.Parameters.AddWithValue("@AdressenNr", AdressenNr) Dim dr = cmd.ExecuteReader() @@ -271,7 +292,7 @@ Public Class cAdressen 'Return Nothing Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) - ' MsgBox(test & "Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + ' MsgBox(test & "Fehler In der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) End Try ' Return Nothing End Sub diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb b/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb index 6dcca81e..788cb76b 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb @@ -366,8 +366,11 @@ Public Class cUIDPruefung UID_TMP.SAVE() If valid Then If SaveErgInAdressen Then - AD.UstIdGeprüft = Now.ToShortDateString - AD.SAVE() + + AD.UpdateSpecialField("UstIdGeprüft", Now.ToShortDateString) + + 'AD.UstIdGeprüft = Now.ToShortDateString + 'AD.SAVE() End If End If Return UID_TMP diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Finanzonline/cFinanzOnlineWebService.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Finanzonline/cFinanzOnlineWebService.vb index 107bdb43..f7b46615 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Finanzonline/cFinanzOnlineWebService.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Finanzonline/cFinanzOnlineWebService.vb @@ -96,8 +96,6 @@ Public Class cFinanzOnlineWebService If AD.UstIdKz IsNot Nothing AndAlso AD.UstIdNr IsNot Nothing Then - - Try If AskIfDouble Then If IsDate(AD.UstIdGeprüft) AndAlso CDate(AD.UstIdGeprüft).ToShortDateString = Now.ToShortDateString Then @@ -210,8 +208,10 @@ Public Class cFinanzOnlineWebService If (UID_TMP.uid_valid) Then 'OK If SaveErgInAdressen Then - AD_new.UstIdGeprüft = Now.ToShortDateString - AD_new.SAVE() + + AD_new.UpdateSpecialField("UstIdGeprüft", Now.ToShortDateString) + 'AD_new.UstIdGeprüft = Now.ToShortDateString + 'AD_new.SAVE() End If End If @@ -223,8 +223,11 @@ Public Class cFinanzOnlineWebService If (returnInt = 0) Then 'OK If SaveErgInAdressen Then - AD.UstIdGeprüft = Now.ToShortDateString - AD.SAVE() + + AD.UpdateSpecialField("UstIdGeprüft", Now.ToShortDateString) + 'AD.UstIdGeprüft = Now.ToShortDateString + 'AD.SAVE() + End If End If